rely on engine's togglemenu on first menu start, detect menu_restart later

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index e1c5cfc0db90dc1660548328c0f20035af4f0822..62702c662feea632f8ac8eaf97cee9355aedeeea 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1627,6 +1627,7 @@ alias _gunalign_14 "cl_gunalign 3"
 alias _gunalign_update "_gunalign_$v_flipped$menu_cl_gunalign"
 
 set _menu_alpha "" // will be set by menu QC to the current fading of the menu, can be used by CSQC to fade items
+set _menu_initialized 0 "is 0 on first menu loading, 1 later"
 
 set g_triggerimpulse_accel_power 1 "trigger_impulse accelerator power (applied BEFORE the multiplier)"
 set g_triggerimpulse_accel_multiplier 1 "trigger_impulse accelerator multiplier (applied AFTER the power)"

diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc
index 3d2121d1fc7c1ad5d8e202df6b6a2eed659a6238..2f4e72eb243d9e97091def7c325a371bb97ef062 100644 (file)
--- a/qcsrc/menu/menu.qc
+++ b/qcsrc/menu/menu.qc
@@ -81,11 +81,11 @@ void m_init()
                localcmd("\nr_restart\n");
        initConwidths();
 
-       m_gamestatus();
-       if(gamestatus & (GAME_ISSERVER | GAME_CONNECTED))
-               m_hide();
-       else
+       if(cvar("_menu_initialized")) // always show menu after menu_restart
                m_display();
+       else
+               m_hide();
+       cvar_set("_menu_initialized", "1");
 }
 
 float MENU_ASPECT = 1.25; // 1280x1024