Merge remote-tracking branch 'origin/master' into tzork/gm_nexball

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

diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc
index 3d2121d1fc7c1ad5d8e202df6b6a2eed659a6238..b541a7f0639f973e1063ba0c90f3af994973c21d 100644 (file)
--- a/qcsrc/menu/menu.qc
+++ b/qcsrc/menu/menu.qc
@@ -39,6 +39,7 @@ void m_gamestatus()
 
 void m_init()
 {
+       float restarting = 0;
        cvar_set("_menu_alpha", "0");
        prvm_language = cvar_string("prvm_language");
        if(prvm_language == "")
@@ -46,6 +47,7 @@ void m_init()
                prvm_language = "en";
                cvar_set("prvm_language", prvm_language);
                localcmd("\nmenu_restart\n");
+               restarting = 1;
        }
        prvm_language = strzone(prvm_language);
        cvar_set("_menu_prvm_language", prvm_language);
@@ -81,11 +83,14 @@ void m_init()
                localcmd("\nr_restart\n");
        initConwidths();
 
-       m_gamestatus();
-       if(gamestatus & (GAME_ISSERVER | GAME_CONNECTED))
-               m_hide();
-       else
-               m_display();
+       if(!restarting)
+       {
+               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