From 3c4e0ec1bfbfb64e6af55a58b7c6a444873c35b3 Mon Sep 17 00:00:00 2001
From: BuildTools <unconfigured@null.spigotmc.org>
Date: Sat, 28 Nov 2020 23:26:04 +0100
Subject: [PATCH] Windows fixes

---
 Rare/GameWidget.py      |  7 +++++--
 Rare/TabWidgets.py      | 16 +++++++++++-----
 Rare/utils/RareUtils.py |  2 --
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Rare/GameWidget.py b/Rare/GameWidget.py
index e2c47fe0..c7b36e60 100644
--- a/Rare/GameWidget.py
+++ b/Rare/GameWidget.py
@@ -121,7 +121,6 @@ class GameWidget(QWidget):
         settings_dialog = GameSettingsDialog(self.game)
         action = settings_dialog.get_settings()
         if action == "uninstall":
-
             legendaryUtils.uninstall(self.app_name, self.core)
             self.signal.emit(self.app_name)
 
@@ -163,14 +162,18 @@ class UninstalledGameWidget(QWidget):
         logger.info("install " + self.title)
         dia = InstallDialog(self.game)
         data = dia.get_data()
+        print(data)
         if data != 0:
             path = data.get("install_path")
             logger.info(f"install {self.app_name} in path {path}")
             # TODO
             self.proc = QProcess()
-            self.proc.start("legendary", f"-y --base-path {path} {self.app_name}".split(" "))
             self.proc.finished.connect(self.download_finished)
+            self.proc.start("legendary", ["-y", f"--base-path {path}", self.app_name])
+
             # legendaryUtils.install(self.app_name, path=path)
+        else:
+            logger.info("Download canceled")
 
     def download_finished(self):
         self.setVisible(False)
diff --git a/Rare/TabWidgets.py b/Rare/TabWidgets.py
index b9ecde74..bb0bdf02 100644
--- a/Rare/TabWidgets.py
+++ b/Rare/TabWidgets.py
@@ -107,13 +107,19 @@ class Settings(QScrollArea):
         if not self.config["Legendary"].get("locale"):
             self.config["Legendary"]["locale"] = "en-US"
 
-        env_vars = self.config["default.env"]
-        self.table = QTableWidget(len(env_vars), 2)
+        env_vars = self.config.get("default.env")
+        if env_vars:
+            self.table = QTableWidget(len(env_vars), 2)
+            for i, label in enumerate(env_vars):
+                self.table.setItem(i, 0, QTableWidgetItem(label))
+                self.table.setItem(i, 1, QTableWidgetItem(env_vars[label]))
+
+        else:
+            self.table = QTableWidget(0,2)
 
         self.table.setHorizontalHeaderLabels(["Variable", "Value"])
-        for i, label in enumerate(env_vars):
-            self.table.setItem(i, 0, QTableWidgetItem(label))
-            self.table.setItem(i, 1, QTableWidgetItem(env_vars[label]))
+
+
 
         self.form_group_box = QGroupBox("Legendary Defaults")
         self.form = QFormLayout()
diff --git a/Rare/utils/RareUtils.py b/Rare/utils/RareUtils.py
index 24a57ebd..ceca4804 100644
--- a/Rare/utils/RareUtils.py
+++ b/Rare/utils/RareUtils.py
@@ -28,8 +28,6 @@ def download_images(signal: pyqtSignal, core: LegendaryCore):
                     with open(f"{IMAGE_DIR}/{game.app_name}/{image['type']}.png", "wb") as f:
                         f.write(requests.get(url).content)
                         f.close()
-                else:
-                    logger.info(f"Image for {game.app_title} exists")
 
         if not os.path.isfile(f'{IMAGE_DIR}/' + game.app_name + '/UninstalledArt.png'):