Merge branch 'master' into terencehill/quickmenu_UPDATE

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / scoreboard.qc

diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
index 82d3a53ae1fe297a1742a9b24deb2216eee4ed57..d931efcff9b2976cf587c3d331d9e8c139260758 100644 (file)
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@ -952,6 +952,8 @@ vector HUD_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_siz
 float HUD_WouldDrawScoreboard() {
        if (autocvar__hud_configure)
                return 0;
+       else if (HUD_QuickMenu_IsOpened())
+               return 0;
        else if (scoreboard_showscores)
                return 1;
        else if (intermission == 1)