From 4a95cc028878532ef3b9f783f55f19254df63a39 Mon Sep 17 00:00:00 2001
From: Samual <samual@xonotic.org>
Date: Tue, 27 Dec 2011 16:06:46 -0500
Subject: [PATCH] Fix timeouts

---
 qcsrc/server/command/common.qc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/qcsrc/server/command/common.qc b/qcsrc/server/command/common.qc
index c333910ec6..3e8d8e7e66 100644
--- a/qcsrc/server/command/common.qc
+++ b/qcsrc/server/command/common.qc
@@ -185,6 +185,8 @@ void timeout_handler_think()
 				
 				self.nextthink = time; // think again next frame to handle it under TIMEOUT_ACTIVE code
 			}
+			
+			return;
 		}
 		
 		
@@ -536,7 +538,7 @@ void CommonCommand_timeout(float request, entity caller) // DEAR GOD THIS COMMAN
 				{					
 					if(caller) { caller.allowed_timeouts -= 1; }
 					
-					bprint(GetCallerName(caller), " ^7called a timeout", (caller ? strcat(" (", ftos(caller.allowed_timeouts), " timeouts left)") : string_null), "!\n"); // write a bprint who started the timeout (and how many they have left)
+					bprint(GetCallerName(caller), " ^7called a timeout", (caller ? strcat(" (", ftos(caller.allowed_timeouts), " timeout(s) left)") : string_null), "!\n"); // write a bprint who started the timeout (and how many they have left)
 					
 					timeout_status = TIMEOUT_LEADTIME;
 					timeout_caller = caller;
-- 
2.39.5