From 39a744962592175ecd5063fddd1ad8ef23708de1 Mon Sep 17 00:00:00 2001
From: SandPoot <enric_gabirel@hotmail.com>
Date: Wed, 13 Oct 2021 16:57:00 -0300
Subject: [PATCH] Update ticker.dm

---
 code/controllers/subsystem/ticker.dm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index ff5539a2b1..a1e80b3954 100755
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -182,12 +182,11 @@ SUBSYSTEM_DEF(ticker)
 				timeLeft = 0
 
 			if(!modevoted)
-				if(!CONFIG_GET(string/force_gamemode))
+				var/forcemode = CONFIG_GET(string/force_gamemode)
+				if(forcemode)
+					force_gamemode(forcemode)
+				if(!forcemode || (GLOB.master_mode == "dynamic" && CONFIG_GET(flag/dynamic_voting))
 					send_gamemode_vote()
-				else
-					force_gamemode(CONFIG_GET(string/force_gamemode))
-					if(GLOB.master_mode == "dynamic" && CONFIG_GET(flag/dynamic_voting))
-						send_gamemode_vote()
 			//countdown
 			if(timeLeft < 0)
 				return