From 05578787e97ebb518258da4fcb7077d488f5d871 Mon Sep 17 00:00:00 2001 From: Shpoike Date: Mon, 10 Jul 2023 03:07:37 +0100 Subject: [PATCH] Ask menuqc to close its menus on map changes instead of just stripping its focus and leaving it confused. --- Quake/host_cmd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Quake/host_cmd.c b/Quake/host_cmd.c index ba7ee6d1..106311af 100644 --- a/Quake/host_cmd.c +++ b/Quake/host_cmd.c @@ -849,7 +849,10 @@ static void Host_Map_f (void) CL_Disconnect (); Host_ShutdownServer(false); - key_dest = key_game; // remove console or menu + if (key_dest == key_menu) + M_ToggleMenu(0); //ask the menu to hide itself so we don't get pooped by our poor tracking of input state on the next line. + else + key_dest = key_game; // remove console or menu if (cls.state != ca_dedicated) IN_UpdateGrabs(); SCR_BeginLoadingPlaque ();