Merge branch 'z411/pickup_panel' into 'master'

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

diff --git a/qcsrc/menu/xonotic/leavematchbutton.qc b/qcsrc/menu/xonotic/leavematchbutton.qc
index efaafc120214da7a6f52b3e05342c4b6e9c7dbfd..d2117356b8bb91e56db337cae535084e45e09848 100644 (file)
--- a/qcsrc/menu/xonotic/leavematchbutton.qc
+++ b/qcsrc/menu/xonotic/leavematchbutton.qc
@@ -10,9 +10,11 @@ string leaveMatchButton_getText(entity me)
 {
        if (me.disabled)
                return _("Leave current match");
+       else if(isdemo())
+               return _("Stop demo");
        else if(cvar("g_campaign"))
                return _("Leave campaign");
-       else if (cvar_string("net_address") == "127.0.0.1" && cvar_string("net_address_ipv6") == "::1")
+       else if (isServerSingleplayer())
                return _("Leave singleplayer");
        else
                return _("Leave multiplayer");
@@ -20,11 +22,11 @@ string leaveMatchButton_getText(entity me)
 
 string leaveMatchButton_getTooltip(entity me)
 {
-       if (me.disabled)
+       if (me.disabled || isdemo())
                return "-";
        else if(cvar("g_campaign"))
                return _("Leave current campaign level");
-       else if (cvar_string("net_address") == "127.0.0.1" && cvar_string("net_address_ipv6") == "::1")
+       else if (isServerSingleplayer())
                return _("Leave current singleplayer match");
        else
                return _("Leave current multiplayer match / Disconnect from the server");