From c9f1a21bd2b8888e5b4dc75123c19b0a016ee261 Mon Sep 17 00:00:00 2001
From: Bryce Wilson <gyroscope15@gmail.com>
Date: Wed, 11 Sep 2024 04:22:04 -0700
Subject: [PATCH] BizHawkClient: Remove `run_gui` in favor of `make_gui`
 (#3910)

---
 CommonClient.py            |  2 +-
 worlds/_bizhawk/context.py | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/CommonClient.py b/CommonClient.py
index 911de422..6bdd8fc8 100644
--- a/CommonClient.py
+++ b/CommonClient.py
@@ -662,7 +662,7 @@ class CommonContext:
         logger.exception(msg, exc_info=exc_info, extra={'compact_gui': True})
         self._messagebox_connection_loss = self.gui_error(msg, exc_info[1])
 
-    def make_gui(self) -> type:
+    def make_gui(self) -> typing.Type["kvui.GameManager"]:
         """To return the Kivy App class needed for run_gui so it can be overridden before being built"""
         from kvui import GameManager
 
diff --git a/worlds/_bizhawk/context.py b/worlds/_bizhawk/context.py
index 234faf3b..896c8fb7 100644
--- a/worlds/_bizhawk/context.py
+++ b/worlds/_bizhawk/context.py
@@ -59,14 +59,10 @@ class BizHawkClientContext(CommonContext):
         self.bizhawk_ctx = BizHawkContext()
         self.watcher_timeout = 0.5
 
-    def run_gui(self):
-        from kvui import GameManager
-
-        class BizHawkManager(GameManager):
-            base_title = "Archipelago BizHawk Client"
-
-        self.ui = BizHawkManager(self)
-        self.ui_task = asyncio.create_task(self.ui.async_run(), name="UI")
+    def make_gui(self):
+        ui = super().make_gui()
+        ui.base_title = "Archipelago BizHawk Client"
+        return ui
 
     def on_package(self, cmd, args):
         if cmd == "Connected":