g_balance_teams 0 should also turn off imbalance prevention

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index ee80f812b202a52c3866fd29775962b37e6e07c8..c245a30a32995bc8f2a7560ebbc1a77ee504061a 100644 (file)
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -884,7 +884,8 @@ void SV_ChangeTeam(float _color)
                return; // changing teams is not allowed
        }
 
-       if(autocvar_g_balance_teams_prevent_imbalance)
+       // autocvar_g_balance_teams_prevent_imbalance only makes sense if autocvar_g_balance_teams is on, as it makes the team selection dialog pointless
+       if(autocvar_g_balance_teams && autocvar_g_balance_teams_prevent_imbalance)
        {
                GetTeamCounts(self);
                if(!TeamSmallerEqThanTeam(dteam, steam, self))