From 583f75d2355dce2ee95bf5f3779b82442068c8dc Mon Sep 17 00:00:00 2001
From: Dummerle <44114474+Dummerle@users.noreply.github.com>
Date: Thu, 23 Jun 2022 22:01:14 +0200
Subject: [PATCH] Fix some errors

---
 rare/components/tabs/games/game_utils.py | 13 ++++++++++---
 rare/game_launch_helper/__init__.py      |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/rare/components/tabs/games/game_utils.py b/rare/components/tabs/games/game_utils.py
index a017dc7b..d74126ee 100644
--- a/rare/components/tabs/games/game_utils.py
+++ b/rare/components/tabs/games/game_utils.py
@@ -239,8 +239,13 @@ class GameUtils(QObject):
         self.running_games[app_name] = game_process
 
     def game_finished(self, exit_code, app_name):
-        if exit_code == -1234:
+        if self.running_games.get(app_name):
             self.running_games.pop(app_name)
+        if exit_code == -1234:
+            return
+
+        self.finished.emit(app_name, "")
+
         logger.info(f"Game exited with exit code: {exit_code}")
         self.console.log(f"Game exited with code: {exit_code}")
         self.signals.set_discord_rpc.emit("")
@@ -259,6 +264,7 @@ class GameUtils(QObject):
             if resp == 0:
                 QDesktopServices.openUrl(QUrl("https://www.dm.origin.com/download"))
             return
+
         if exit_code != 0:
             QMessageBox.warning(
                 None,
@@ -273,7 +279,6 @@ class GameUtils(QObject):
         game: RunningGameModel = self.running_games.get(app_name, None)
         if app_name in self.running_games.keys():
             self.running_games.pop(app_name)
-        self.finished.emit(app_name, "")
 
         if self.core.get_game(app_name).supports_cloud_saves:
             if exit_code != 0:
@@ -289,7 +294,9 @@ class GameUtils(QObject):
                 )
                 if r != QMessageBox.Yes:
                     return
-            self.cloud_save_utils.game_finished(app_name, game.always_ask_sync)
+
+            # TODO move this to helper
+            self.cloud_save_utils.game_finished(app_name, always_ask=False)
 
     def _launch_pre_command(self, env: dict):
         proc = QProcess()
diff --git a/rare/game_launch_helper/__init__.py b/rare/game_launch_helper/__init__.py
index 7d3a38ca..4ee974f1 100644
--- a/rare/game_launch_helper/__init__.py
+++ b/rare/game_launch_helper/__init__.py
@@ -61,7 +61,7 @@ class GameProcessApp(RareApp):
     server: QLocalServer
     socket: QLocalSocket = None
     exit_app = pyqtSignal()
-    console: Console
+    console: Console = None
     success: bool = True
 
     def __init__(self, app_name: str):