diff options
| author | Thilo Schulz <arny@ats.s.bawue.de> | 2011-08-01 10:16:40 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-10 23:11:06 +0000 |
| commit | 3afa3cecfe43264e09c07ab21518ed7fe0acba7d (patch) | |
| tree | 3137f152498f6893b1bf7618e0ab5e5923de2e11 /src/client | |
| parent | c039c00ca0fe051f8ed243c08d238e739027cb76 (diff) | |
- Fix already defined command warnings for minimize - Fix recursive CL_Shutdown warning and "command already defined" warnings when quitting while playing on a server that changed the gamedir.
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/cl_main.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/client/cl_main.c b/src/client/cl_main.c index 16f594ee..9e00bb6f 100644 --- a/src/client/cl_main.c +++ b/src/client/cl_main.c @@ -146,6 +146,8 @@ int serverStatusCount; void hA3Dg_ExportRenderGeom (refexport_t *incoming_re); #endif +static int isQuitting = qfalse; + extern void SV_BotFrame( int time ); void CL_CheckForResend( void ); void CL_ShowIP_f(void); @@ -1473,7 +1475,9 @@ void CL_Disconnect( qboolean showMainMenu ) { } CL_UpdateGUID( NULL, 0 ); - CL_OldGame(); + + if(!isQuitting) + CL_OldGame(); } @@ -3694,7 +3698,7 @@ CL_Shutdown =============== */ -void CL_Shutdown(char *finalmsg, qboolean disconnect) +void CL_Shutdown(char *finalmsg, qboolean disconnect, qboolean quit) { static qboolean recursive = qfalse; @@ -3710,6 +3714,8 @@ void CL_Shutdown(char *finalmsg, qboolean disconnect) } recursive = qtrue; + isQuitting = quit; + if(disconnect) CL_Disconnect(qtrue); @@ -3739,7 +3745,6 @@ void CL_Shutdown(char *finalmsg, qboolean disconnect) Cmd_RemoveCommand ("model"); Cmd_RemoveCommand ("video"); Cmd_RemoveCommand ("stopvideo"); - Cmd_RemoveCommand ("minimize"); CL_ShutdownInput(); Con_Shutdown(); |