From: terencehill <piuntn@gmail.com>
Date: Sat, 7 Jan 2017 13:39:15 +0000 (+0100)
Subject: Fix players not blocked and not able to vote when a CA match ends. It fixes #1849
X-Git-Tag: xonotic-v0.8.2~315
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2cee5d0c7a381f6a01fe020f43af6f4b83203329;p=xonotic%2Fxonotic-data.pk3dir.git

Fix players not blocked and not able to vote when a CA match ends. It fixes #1849
---

diff --git a/qcsrc/server/round_handler.qc b/qcsrc/server/round_handler.qc
index 6a18a6b5b..cbfc7c79d 100644
--- a/qcsrc/server/round_handler.qc
+++ b/qcsrc/server/round_handler.qc
@@ -6,6 +6,13 @@
 
 void round_handler_Think(entity this)
 {
+	if (intermission_running)
+	{
+		round_handler_Reset(0);
+		round_handler_Remove();
+		return;
+	}
+
 	if (time < game_starttime)
 	{
 		round_handler_Reset(game_starttime);
@@ -15,13 +22,6 @@ void round_handler_Think(entity this)
 	if (game_stopped)
 		game_stopped = false;
 
-	if (intermission_running)
-	{
-		round_handler_Reset(0);
-		round_handler_Remove();
-		return;
-	}
-
 	if (this.wait)
 	{
 		this.wait = false;