about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSushiTee <weichel.sascha@xxx.xx>2012-01-26 22:17:26 +0100
committerSushiTee <weichel.sascha@xxx.xx>2012-01-26 22:17:26 +0100
commit4b2a34e1c5885c332f6e8299f9822aef8ae8f766 (patch)
treed2ba6ffa30c09208a707d2fc771852013d27d877
parent1a1b4a096a08c58fed357ee0c6afbc0e5218f7a8 (diff)
downloadzcatch-4b2a34e1c5885c332f6e8299f9822aef8ae8f766.tar.gz
zcatch-4b2a34e1c5885c332f6e8299f9822aef8ae8f766.zip
force vote only if there is a vote
-rw-r--r--src/game/server/gamecontext.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp
index 87b9b3b7..96f981a6 100644
--- a/src/game/server/gamecontext.cpp
+++ b/src/game/server/gamecontext.cpp
@@ -1385,6 +1385,11 @@ void CGameContext::ConClearVotes(IConsole::IResult *pResult, void *pUserData)
 void CGameContext::ConVote(IConsole::IResult *pResult, void *pUserData)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
+
+	// check if there is a vote running
+	if(!pSelf->m_VoteCloseTime)
+		return;
+
 	if(str_comp_nocase(pResult->GetString(0), "yes") == 0)
 		pSelf->m_VoteEnforce = CGameContext::VOTE_ENFORCE_YES;
 	else if(str_comp_nocase(pResult->GetString(0), "no") == 0)