Merge branch 'drjaska/invalid-sv_vote_gametype_options' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mapvoting.qc

diff --git a/qcsrc/server/mapvoting.qc b/qcsrc/server/mapvoting.qc
index d68b35f435bd0ecced8049fc5886ba0dab5c4dc2..051968eb00c488cbef6ebc9d53f2dcca818a9fca 100644 (file)
--- a/qcsrc/server/mapvoting.qc
+++ b/qcsrc/server/mapvoting.qc
@@ -89,6 +89,10 @@ int GameTypeVote_GetMask()
        gametype_mask = 0;
        for(j = 0; j < n; ++j)
                gametype_mask |= GameTypeVote_Type_FromString(argv(j)).m_flags;
+
+       if (gametype_mask == 0)
+               gametype_mask |= MapInfo_CurrentGametype().m_flags;
+
        return gametype_mask;
 }