From: terencehill <piuntn@gmail.com>
Date: Mon, 7 Mar 2022 13:16:02 +0000 (+0100)
Subject: Stop countdown to timeout start if timeout was aborted with timein
X-Git-Tag: xonotic-v0.8.5~171
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=5dc380af5313b4d3b5922ec4350bd98fac0ace6f;p=xonotic%2Fxonotic-data.pk3dir.git

Stop countdown to timeout start if timeout was aborted with timein
---

diff --git a/qcsrc/server/command/common.qc b/qcsrc/server/command/common.qc
index c2e039f753..056a8e9e6e 100644
--- a/qcsrc/server/command/common.qc
+++ b/qcsrc/server/command/common.qc
@@ -664,6 +664,7 @@ void CommonCommand_timein(int request, entity caller)
 							timeout_status = TIMEOUT_INACTIVE;
 							timeout_time = 0;
 							timeout_handler.nextthink = time;  // timeout_handler has to take care of it immediately
+							Kill_Notification(NOTIF_ALL, NULL, MSG_CENTER, CPID_TIMEOUT);
 							bprint(strcat("^7The timeout was aborted by ", GetCallerName(caller), " !\n"));
 							return;
 						}