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

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / menu.qc

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