From: vortex <vortex@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 2 May 2010 19:43:54 +0000 (+0000)
Subject: call m_hide() on loadgame/map/changelevel/restart if keydest is menu one (menu or... 
X-Git-Tag: xonotic-v0.1.0preview~230^2~310
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=d654a049fd0b331a4fd7b65e3c06ae087ebe77e6;p=xonotic%2Fdarkplaces.git

call m_hide() on loadgame/map/changelevel/restart if keydest is menu one (menu or menu_grabbed), since we are going to force it to key_game (which if not forcing to m_hide leads to menu drawn but not reacting to key events).

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10167 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/host_cmd.c b/host_cmd.c
index 8fa7017f..24111c58 100644
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -374,6 +374,8 @@ void Host_Map_f (void)
 	}
 
 	// remove menu
+	if (key_dest == key_menu || key_dest == key_menu_grabbed)
+		MR_ToggleMenu(0);
 	key_dest = key_game;
 
 	svs.serverflags = 0;			// haven't completed an episode yet
@@ -407,6 +409,8 @@ void Host_Changelevel_f (void)
 	}
 
 	// remove menu
+	if (key_dest == key_menu || key_dest == key_menu_grabbed)
+		MR_ToggleMenu(0);
 	key_dest = key_game;
 
 	SV_VM_Begin();
@@ -442,6 +446,8 @@ void Host_Restart_f (void)
 	}
 
 	// remove menu
+	if (key_dest == key_menu || key_dest == key_menu_grabbed)
+		MR_ToggleMenu(0);
 	key_dest = key_game;
 
 	allowcheats = sv_cheats.integer != 0;
@@ -774,6 +780,8 @@ void Host_Loadgame_f (void)
 		CL_Disconnect ();
 
 	// remove menu
+	if (key_dest == key_menu || key_dest == key_menu_grabbed)
+		MR_ToggleMenu(0);
 	key_dest = key_game;
 
 	cls.demonum = -1;		// stop demo loop in case this fails