Fix timeouts

diff --git a/qcsrc/server/command/common.qc b/qcsrc/server/command/common.qc
index c333910ec6ab6e6a63cd5f68587b474c30706cc2..3e8d8e7e668643ce41fb21c6ea04adcd7ceafb3a 100644 (file)
--- 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;