summaryrefslogtreecommitdiff
path: root/src/client/cl_main.c
diff options
context:
space:
mode:
authorThilo Schulz <arny@ats.s.bawue.de>2011-08-02 23:34:50 +0000
committerTim Angus <tim@ngus.net>2013-01-10 23:26:54 +0000
commitb92938cc6f3622058bef8a98bf1c600e40c63c5d (patch)
treed3bc9acca2ec90ad060cb4c35a07513c1ddb9048 /src/client/cl_main.c
parent7d070fc0b615efad5401be9f64d0fe26323f49e7 (diff)
Fix game restart after curl download finished
Diffstat (limited to 'src/client/cl_main.c')
-rw-r--r--src/client/cl_main.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/client/cl_main.c b/src/client/cl_main.c
index d77d7f95..cfd41c53 100644
--- a/src/client/cl_main.c
+++ b/src/client/cl_main.c
@@ -148,7 +148,7 @@ int serverStatusCount;
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 );
@@ -1478,8 +1478,10 @@ void CL_Disconnect( qboolean showMainMenu ) {
CL_UpdateGUID( NULL, 0 );
- if(!isQuitting)
+ if(!noGameRestart)
CL_OldGame();
+ else
+ noGameRestart = qfalse;
}
@@ -1658,6 +1660,7 @@ void CL_Connect_f( void ) {
Cvar_Set( "sv_killserver", "1" );
SV_Frame( 0 );
+ noGameRestart = qtrue;
CL_Disconnect( qtrue );
Con_Close();
@@ -3716,7 +3719,7 @@ void CL_Shutdown(char *finalmsg, qboolean disconnect, qboolean quit)
}
recursive = qtrue;
- isQuitting = quit;
+ noGameRestart = quit;
if(disconnect)
CL_Disconnect(qtrue);