From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 27 Jan 2010 06:10:18 +0000 (+0000)
Subject: REALLY fix the ESC menu toggle
X-Git-Tag: xonotic-v0.1.0preview~230^2~596
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=eac4e558caa6eb8e736558a45433d9a7078ac262;p=xonotic%2Fdarkplaces.git

REALLY fix the ESC menu toggle

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

diff --git a/menu.c b/menu.c
index 8067e63f..6033cb8b 100644
--- a/menu.c
+++ b/menu.c
@@ -279,14 +279,14 @@ void M_ToggleMenu(int mode)
 
 	if ((key_dest != key_menu && key_dest != key_menu_grabbed) || m_state != m_main)
 	{
-		if(mode == 1)
-			return;
+		if(mode == 0)
+			return; // the menu is off, and we want it off
 		M_Menu_Main_f ();
 	}
 	else
 	{
-		if(mode == 0)
-			return;
+		if(mode == 1)
+			return; // the menu is on, and we want it on
 		key_dest = key_game;
 		m_state = m_none;
 	}