From 60df01b76c621e9bd881427c24bec41aac1b4db4 Mon Sep 17 00:00:00 2001
From: Richard Allen <ra@ra.is>
Date: Thu, 4 Oct 2012 16:09:00 +0000
Subject: [PATCH] IOQ3 commit 2316

---
 reaction/code/game/g_main.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/reaction/code/game/g_main.c b/reaction/code/game/g_main.c
index 7f03de62..c31d9e7e 100644
--- a/reaction/code/game/g_main.c
+++ b/reaction/code/game/g_main.c
@@ -2472,7 +2472,11 @@ void CheckTournament(void)
 		// if all players have arrived, start the countdown
 		if (level.warmupTime < 0) {
 			// fudge by -1 to account for extra delays
-			level.warmupTime = level.time + (g_warmup.integer - 1) * 1000;
+			if ( g_warmup.integer > 1 ) {
+				level.warmupTime = level.time + (g_warmup.integer - 1) * 1000;
+			} else {
+				level.warmupTime = 0;
+			}
 			trap_SetConfigstring(CS_WARMUP, va("%i", level.warmupTime));
 			return;
 		}