summaryrefslogtreecommitdiff
path: root/src/client/cl_parse.c
diff options
context:
space:
mode:
authorThilo Schulz <arny@ats.s.bawue.de>2011-08-24 14:47:57 +0000
committerTim Angus <tim@ngus.net>2013-01-10 23:37:16 +0000
commitc02b117b94f6465556d882fcf515c4d6041644f6 (patch)
treeea5aa5a371418a445766b85d20d4850203215980 /src/client/cl_parse.c
parentbbc19311f31e8983c2dcfbe2992122fe911282c2 (diff)
Fix auto game-restart when disconnecting from a server that explicitly set fs_game to "baseq3" instead of ""
Diffstat (limited to 'src/client/cl_parse.c')
-rw-r--r--src/client/cl_parse.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/client/cl_parse.c b/src/client/cl_parse.c
index e8bb6011..38d9edd3 100644
--- a/src/client/cl_parse.c
+++ b/src/client/cl_parse.c
@@ -529,12 +529,14 @@ void CL_ParseGamestate( msg_t *msg ) {
CL_StopRecord_f();
// reinitialize the filesystem if the game directory has changed
- if(FS_ConditionalRestart(clc.checksumFeed, qfalse) && !cls.oldGameSet)
+ if(!cls.oldGameSet && (Cvar_Flags("fs_game") & CVAR_MODIFIED))
{
cls.oldGameSet = qtrue;
Q_strncpyz(cls.oldGame, oldGame, sizeof(cls.oldGame));
}
+ FS_ConditionalRestart(clc.checksumFeed, qfalse);
+
// This used to call CL_StartHunkUsers, but now we enter the download state before loading the
// cgame
CL_InitDownloads();