From 06628af7c5cb99a443970c737bb3432245aa811f Mon Sep 17 00:00:00 2001
From: Thilo Schulz <arny@ats.s.bawue.de>
Date: Wed, 3 Aug 2011 00:58:33 +0000
Subject: [PATCH] Don't do game_restart if game directory changed from "" to
 "baseq3" or "baseq3" to ""

---
 code/client/cl_main.c |  4 ++--
 code/qcommon/files.c  | 21 ++++++++++++++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/code/client/cl_main.c b/code/client/cl_main.c
index fcadaf4e..deaa4120 100644
--- a/code/client/cl_main.c
+++ b/code/client/cl_main.c
@@ -1362,8 +1362,8 @@ static void CL_OldGame(void)
 	{
 		// change back to previous fs_game
 		cls.oldGameSet = qfalse;
-		Cvar_Set("fs_game", cls.oldGame);
-		Com_GameRestart(0, qtrue);
+		Cvar_Set2("fs_game", cls.oldGame, qtrue);
+		FS_ConditionalRestart(clc.checksumFeed, qfalse);
 	}
 }
 
diff --git a/code/qcommon/files.c b/code/qcommon/files.c
index e33350e8..d2e906a9 100644
--- a/code/qcommon/files.c
+++ b/code/qcommon/files.c
@@ -3884,12 +3884,27 @@ restart if necessary
 */
 qboolean FS_ConditionalRestart(int checksumFeed, qboolean disconnect)
 {
+	int retval;
+	
 	if(fs_gamedirvar->modified)
 	{
-		Com_GameRestart(checksumFeed, disconnect);
-		return qtrue;
+		if(FS_FilenameCompare(lastValidGame, fs_gamedirvar->string) &&
+		   (*lastValidGame || FS_FilenameCompare(fs_gamedirvar->string, com_basegame->string)) &&
+		   (*fs_gamedirvar->string || FS_FilenameCompare(lastValidGame, com_basegame->string)))
+		{
+			Com_GameRestart(checksumFeed, disconnect);
+			return qtrue;
+		}
+		else
+		{
+			fs_gamedirvar->modified = qfalse;
+			retval = qtrue;
+		}
 	}
-	else if(checksumFeed != fs_checksumFeed)
+	else
+		retval = qfalse;
+	
+	if(checksumFeed != fs_checksumFeed)
 		FS_Restart(checksumFeed);
 	else if(fs_numServerPaks && !fs_reordered)
 		FS_ReorderPurePaks();