From: Samual <samual@xonotic.org>
Date: Tue, 27 Dec 2011 21:06:46 +0000 (-0500)
Subject: Fix timeouts
X-Git-Tag: xonotic-v0.6.0~188^2~28^2~52
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4a95cc028878532ef3b9f783f55f19254df63a39;p=xonotic%2Fxonotic-data.pk3dir.git

Fix timeouts
---

diff --git a/qcsrc/server/command/common.qc b/qcsrc/server/command/common.qc
index c333910ec..3e8d8e7e6 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;