From 7ef1aded6aacc6823a9bc4378c04e109363334ef Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Wed, 6 Jul 2022 18:17:28 +1000
Subject: [PATCH] Fix delay roundend (#9481)

---
 .../Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs
index ef5060bed5..9ec39c8f0c 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs
@@ -277,8 +277,8 @@ public sealed partial class ShuttleSystem
     public bool DelayEmergencyRoundEnd()
     {
         if (_roundEndCancelToken == null) return false;
-        _roundEndCancelToken = null;
         _roundEndCancelToken?.Cancel();
+        _roundEndCancelToken = null;
         return true;
     }
 }