[iortcw] 65/89: All: Move CON_Init ahead of Com_Init to avoid Windows dedicated server crash

Simon McVittie smcv at debian.org
Fri Sep 8 10:44:30 UTC 2017


This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51b
in repository iortcw.

commit eb2c0050e7331ba0d447c8a4b081bffc1bd11207
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date:   Fri Jul 21 07:15:33 2017 -0400

    All: Move CON_Init ahead of Com_Init to avoid Windows dedicated server crash
---
 MP/code/sys/sys_main.c | 3 +--
 SP/code/sys/sys_main.c | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/MP/code/sys/sys_main.c b/MP/code/sys/sys_main.c
index 054aaa0..efbe2d7 100644
--- a/MP/code/sys/sys_main.c
+++ b/MP/code/sys/sys_main.c
@@ -741,11 +741,10 @@ int main( int argc, char **argv )
 		Q_strcat( commandLine, sizeof( commandLine ), " " );
 	}
 
+	CON_Init( );
 	Com_Init( commandLine );
 	NET_Init( );
 
-	CON_Init( );
-
 	signal( SIGILL, Sys_SigHandler );
 	signal( SIGFPE, Sys_SigHandler );
 	signal( SIGSEGV, Sys_SigHandler );
diff --git a/SP/code/sys/sys_main.c b/SP/code/sys/sys_main.c
index 93bf1ad..0044e8c 100644
--- a/SP/code/sys/sys_main.c
+++ b/SP/code/sys/sys_main.c
@@ -741,11 +741,10 @@ int main( int argc, char **argv )
 		Q_strcat( commandLine, sizeof( commandLine ), " " );
 	}
 
+	CON_Init( );
 	Com_Init( commandLine );
 	NET_Init( );
 
-	CON_Init( );
-
 	signal( SIGILL, Sys_SigHandler );
 	signal( SIGFPE, Sys_SigHandler );
 	signal( SIGSEGV, Sys_SigHandler );

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git



More information about the Pkg-games-commits mailing list