r3088 - trunk/data/qcsrc/menu-div0test

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-01-02 13:51:52 -0500 (Wed, 02 Jan 2008)
New Revision: 3088

Modified:
   trunk/data/qcsrc/menu-div0test/menu.qc
Log:
fix menu handling when loading a map


Modified: trunk/data/qcsrc/menu-div0test/menu.qc
===================================================================
--- trunk/data/qcsrc/menu-div0test/menu.qc	2008-01-02 18:04:09 UTC (rev 3087)
+++ trunk/data/qcsrc/menu-div0test/menu.qc	2008-01-02 18:51:52 UTC (rev 3088)
@@ -150,16 +150,13 @@
 	menuPrevTime = t;
 	time += frametime;
 
-	if(getkeydest() == KEY_MENU || getkeydest() == KEY_MENU_GRABBED)
+	if(Menu_Active)
 	{
-		setkeydest(keyGrabber ? KEY_MENU_GRABBED : KEY_MENU);
+		if(getmousetarget() == MT_MENU && (getkeydest() == KEY_MENU || getkeydest() == KEY_MENU_GRABBED))
+			setkeydest(keyGrabber ? KEY_MENU_GRABBED : KEY_MENU);
+		else
+			m_hide();
 	}
-	else
-	{
-		if(Menu_Active)
-			if(getmousetarget() != MT_MENU)
-				m_hide();
-	}
 
 	if(cvar("cl_capturevideo"))
 		frametime = 1 / cvar("cl_capturevideo_fps"); // make capturevideo work smoothly