From 6876f9978e60a5e580c064739ec5b60b8c3953a6 Mon Sep 17 00:00:00 2001
From: ElBread3 <92335081+ElBread3@users.noreply.github.com>
Date: Tue, 15 Oct 2024 11:42:21 -0500
Subject: [PATCH] description + string fixes

---
 src/qt_gui/game_info.h         |  4 ++--
 src/qt_gui/gui_context_menus.h | 16 +++++++++-------
 src/qt_gui/main_window.cpp     |  2 --
 src/qt_gui/translations/en.ts  |  5 +++++
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/qt_gui/game_info.h b/src/qt_gui/game_info.h
index 640b25e49..99805cd52 100644
--- a/src/qt_gui/game_info.h
+++ b/src/qt_gui/game_info.h
@@ -26,8 +26,8 @@ public:
         GameInfo game;
         game.path = filePath;
         std::filesystem::path sce_folder_path = filePath / "sce_sys" / "param.sfo";
-        std::filesystem::path game_update_path =
-            std::filesystem::path(filePath.string() + "-UPDATE");
+        std::filesystem::path game_update_path = filePath;
+        game_update_path += "-UPDATE";
         if (std::filesystem::exists(game_update_path / "sce_sys" / "param.sfo")) {
             sce_folder_path = game_update_path / "sce_sys" / "param.sfo";
         }
diff --git a/src/qt_gui/gui_context_menus.h b/src/qt_gui/gui_context_menus.h
index fba8616af..b8ccb6632 100644
--- a/src/qt_gui/gui_context_menus.h
+++ b/src/qt_gui/gui_context_menus.h
@@ -290,10 +290,14 @@ public:
 
         if (selected == deleteGame || selected == deleteUpdate || selected == deleteDLC) {
             bool error = false;
-            QString folder_path, game_update_path;
+            QString folder_path, game_update_path, dlc_path;
             Common::FS::PathToQString(folder_path, m_games[itemID].path);
             Common::FS::PathToQString(game_update_path, m_games[itemID].path.concat("-UPDATE"));
+            Common::FS::PathToQString(
+                dlc_path, Config::getAddonInstallDir() /
+                                Common::FS::PathFromQString(folder_path).parent_path().filename());
             QString message_type = tr("Game");
+
             if (selected == deleteUpdate) {
                 if (!Config::getSeparateUpdateEnabled()) {
                     QMessageBox::critical(
@@ -302,7 +306,8 @@ public:
                                    "config option "
                                    "to work. If you want to use this feature, please enable it.")));
                     error = true;
-                } else if (!std::filesystem::exists(m_games[itemID].path.concat("-UPDATE"))) {
+                } else if (!std::filesystem::exists(
+                               Common::FS::PathFromQString(game_update_path))) {
                     QMessageBox::critical(nullptr, tr("Error"),
                                           QString(tr("This game has no update to delete!")));
                     error = true;
@@ -311,15 +316,12 @@ public:
                     message_type = tr("Update");
                 }
             } else if (selected == deleteDLC) {
-                std::filesystem::path addon_path =
-                    Config::getAddonInstallDir() /
-                    Common::FS::PathFromQString(folder_path).parent_path().filename();
-                if (!std::filesystem::exists(addon_path)) {
+                if (!std::filesystem::exists(Common::FS::PathFromQString(dlc_path))) {
                     QMessageBox::critical(nullptr, tr("Error"),
                                           QString(tr("This game has no DLC to delete!")));
                     error = true;
                 } else {
-                    folder_path = QString::fromStdString(addon_path.string());
+                    folder_path = dlc_path;
                     message_type = tr("DLC");
                 }
             }
diff --git a/src/qt_gui/main_window.cpp b/src/qt_gui/main_window.cpp
index d80102ff4..78bb7e69a 100644
--- a/src/qt_gui/main_window.cpp
+++ b/src/qt_gui/main_window.cpp
@@ -792,8 +792,6 @@ void MainWindow::InstallDragDropPkg(std::filesystem::path file, int pkgNum, int
                     }
                 }
             } else {
-                QString gameDirPath;
-                Common::FS::PathToQString(gameDirPath, game_folder_path);
                 msgBox.setText(QString(tr("Game already installed") + "\n" + gameDirPath + "\n" +
                                        tr("Would you like to overwrite?")));
                 msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
diff --git a/src/qt_gui/translations/en.ts b/src/qt_gui/translations/en.ts
index 7c44fbdf4..ab7232978 100644
--- a/src/qt_gui/translations/en.ts
+++ b/src/qt_gui/translations/en.ts
@@ -1056,6 +1056,11 @@
 			<source>fullscreenCheckBox</source>
 			<translation>Enable Full Screen:\nAutomatically puts the game window into full-screen mode.\nThis can be toggled by pressing the F11 key.</translation>
 		</message>
+                <message>
+			<location filename="../settings_dialog.cpp" line="293"/>
+			<source>separateUpdatesCheckBox</source>
+			<translation>Enable Separate Update Folder:\nEnables installing game updates into a separate folder for easy management.</translation>
+		</message>
 		<message>
 			<location filename="../settings_dialog.cpp" line="295"/>
 			<source>showSplashCheckBox</source>