MultiServer: properly shutdown even if ctx is invalid

ArchipelagoMW · Nov 10, 2024 · a8275ad · a8275ad
1 parent 913b4d3
commit a8275ad
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/MultiServer.py b/MultiServer.py
@@ -1960,8 +1960,10 @@ def _cmd_status(self, tag: str = "") -> bool:
 
     def _cmd_exit(self) -> bool:
         """Shutdown the server"""
-        self.ctx.server.ws_server.close()
-        self.ctx.exit_event.set()
+        try:
+            self.ctx.server.ws_server.close()
+        finally:
+            self.ctx.exit_event.set()
         return True
 
     @mark_raw