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 6a18a6b5b434952d5b63e8a9556b0777040a71fd..cbfc7c79d8c6b4411a78fc6137d55c168815afc3 100644 (file)
--- a/qcsrc/server/round_handler.qc
+++ b/qcsrc/server/round_handler.qc
@@ -6,6 +6,13 @@
 
 void round_handler_Think(entity this)
 {
 
 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);
        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 (game_stopped)
                game_stopped = false;
 

-       if (intermission_running)
-       {
-               round_handler_Reset(0);
-               round_handler_Remove();
-               return;
-       }
-

        if (this.wait)
        {
                this.wait = false;
        if (this.wait)
        {
                this.wait = false;