Automatically close client when clicking Quit

3 files changed, 8 insertions, 0 deletions

@@ -227,6 +227,10 @@ func scoutLocations(loc_ids):
         sendMessage([{"cmd": "LocationScouts", "locations": loc_ids}])
 
 
+func sendQuit():
+        sendMessage([{"cmd": "Quit"}])
+
+
 func hasItem(item_id):
         return _received_items.has(item_id)
 
@@ -137,6 +137,7 @@ func _connect_pressed():
 func _back_pressed():
         var ap = global.get_node("Archipelago")
         ap.disconnect_from_ap()
+        ap.client.sendQuit()
 
         get_tree().quit()
 
@@ -267,6 +267,8 @@ async def process_game_cmd(ctx: Lingo2GameContext, args: dict):
         async_start(ctx.client.disconnect(), name="client disconnect")
     elif cmd in ["Sync", "LocationChecks", "Say", "StatusUpdate", "LocationScouts"]:
         async_start(ctx.client.send_msgs([args]), name="client forward")
+    elif cmd == "Quit":
+        ctx.client.exit_event.set()
 
 
 async def run_game():
@@ -328,6 +330,7 @@ def client_main(*launch_args: str) -> None:
             logger.exception(e)
 
         await client_ctx.exit_event.wait()
+        client_ctx.ui.stop()
         await client_ctx.shutdown()
 
     Utils.init_logging("Lingo2Client", exception_logger="Client")