From: Mario <mario@smbclan.net>
Date: Tue, 2 Oct 2018 17:24:22 +0000 (+1000)
Subject: Only play 'vote now' announcement if the vote hasn't already passed
X-Git-Tag: xonotic-v0.8.5~1794
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=80c2f3c7d4092618e9f7a4bee61a2c81944f6713;p=xonotic%2Fxonotic-data.pk3dir.git

Only play 'vote now' announcement if the vote hasn't already passed
---

diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc
index 1cb26d1fd..51cf55ce3 100644
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -835,14 +835,15 @@ void VoteCommand_call(int request, entity caller, int argc, string vote_command)
 				}
 
 				FOREACH_CLIENT(IS_REAL_CLIENT(it), { ++tmp_playercount; });
-				if (tmp_playercount > 1)
-					Send_Notification(NOTIF_ALL, NULL, MSG_ANNCE, ANNCE_VOTE_CALL);
 
 				bprint("\{1}^2* ^3", OriginalCallerName(), "^2 calls a vote for ", vote_called_display, "\n");
 				if (autocvar_sv_eventlog)
 					GameLogEcho(strcat(":vote:vcall:", ftos(vote_caller.playerid), ":", vote_called_display));
 				Nagger_VoteChanged();
 				VoteCount(true);  // needed if you are the only one
+
+				if (tmp_playercount > 1 && vote_called != VOTE_NULL)
+					Send_Notification(NOTIF_ALL, NULL, MSG_ANNCE, ANNCE_VOTE_CALL);
 			}
 
 			return;