Merge branch 'master' into terencehill/quickmenu

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

diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
index c635e975496df63c584d1a56b8aa0253e6bd0a20..7b6cff183068749dabc5b8a0570efcb47f1b23b5 100644 (file)
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@ -959,6 +959,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 (QuickMenu_IsOpened())
+               return 0;
        else if (HUD_Radar_Clickable())
                return 0;
        else if (scoreboard_showscores)