Fix centerprint Welcome message displayed together with the Welcome dialog when a...

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 10d4cef9858d88c7d3ee4ad8c2700ddba12ef6c6..0892bb6bf2bf0bd67a21ce4fa727a3c22ff988f5 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -1368,7 +1368,7 @@ void Welcome_Message_Show_Try()
 
        bool want_dialog = (!welcome_msg_force_centerprint && !isdemo() && autocvar_cl_welcome_in_menu_dialog);
        // if want dialog check if menu is initialized but for a short time
-       if (!want_dialog || cvar("_menu_initialized") || time > welcome_msg_menu_check_maxtime)
+       if (!want_dialog || cvar("_menu_initialized") == 2 || time > welcome_msg_menu_check_maxtime)
        {
                if (want_dialog && cvar("_menu_welcome_dialog_available"))
                {

diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc
index efed9ff2eac775a806e2f114e67d8e185069bedb..9331364108cd5a2cfd17429178a5035c69e7793b 100644 (file)
--- a/qcsrc/menu/menu.qc
+++ b/qcsrc/menu/menu.qc
@@ -221,6 +221,8 @@ void m_init_delayed()
        }
 
        if (Menu_Active) m_display();  // delayed menu display
+
+       cvar_set("_menu_initialized", "2");
 }
 
 void m_keyup(float key, float ascii)