From 625066d2da3313e3eb3ec11ca717c57b67ae52ba Mon Sep 17 00:00:00 2001
From: Dummerle <44114474+Dummerle@users.noreply.github.com>
Date: Thu, 11 Aug 2022 21:09:21 +0200
Subject: [PATCH] Fix two small errors in game launch helper

---
 rare/game_launch_helper/__init__.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/rare/game_launch_helper/__init__.py b/rare/game_launch_helper/__init__.py
index 6b26435d..6773b866 100644
--- a/rare/game_launch_helper/__init__.py
+++ b/rare/game_launch_helper/__init__.py
@@ -40,7 +40,7 @@ class PreLaunchThread(QRunnable):
     def prepare_launch(self, app_name) -> Union[LaunchArgs, None]:
         try:
             args = get_launch_args(self.core, InitArgs(app_name))
-        except GameArgsError as e:
+        except Exception as e:
             self.signals.error_occurred.emit(str(e))
             return None
         if not args:
@@ -196,8 +196,11 @@ class GameProcessApp(RareApp):
 
     def stop(self):
         self.logger.info("Stopping server")
-        self.server.close()
-        self.server.deleteLater()
+        try:
+            self.server.close()
+            self.server.deleteLater()
+        except RuntimeError:
+            pass
         self.exit_app.emit()