[quake3-commits] r2129 - trunk/code/client

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2011-08-02 19:34:50 -0400 (Tue, 02 Aug 2011)
New Revision: 2129

Modified:
   trunk/code/client/cl_main.c
Log:
Fix game restart after curl download finished


Modified: trunk/code/client/cl_main.c
===================================================================
--- trunk/code/client/cl_main.c	2011-08-02 22:00:57 UTC (rev 2128)
+++ trunk/code/client/cl_main.c	2011-08-02 23:34:50 UTC (rev 2129)
@@ -146,7 +146,7 @@
 	void hA3Dg_ExportRenderGeom (refexport_t *incoming_re);
 #endif
 
-static int isQuitting = qfalse;
+static int noGameRestart = qfalse;
 
 extern void SV_BotFrame( int time );
 void CL_CheckForResend( void );
@@ -1477,8 +1477,10 @@
 
 	CL_UpdateGUID( NULL, 0 );
 
-	if(!isQuitting)
+	if(!noGameRestart)
 		CL_OldGame();
+	else
+		noGameRestart = qfalse;
 }
 
 
@@ -1732,6 +1734,7 @@
 	Cvar_Set( "sv_killserver", "1" );
 	SV_Frame( 0 );
 
+	noGameRestart = qtrue;
 	CL_Disconnect( qtrue );
 	Con_Close();
 
@@ -3652,7 +3655,7 @@
 	}
 	recursive = qtrue;
 
-	isQuitting = quit;
+	noGameRestart = quit;
 
 	if(disconnect)
 		CL_Disconnect(qtrue);