From 34dd690a7a4d38139992ec35a9eeb81b76cb258d Mon Sep 17 00:00:00 2001
From: ElBread3 <92335081+ElBread3@users.noreply.github.com>
Date: Mon, 2 Dec 2024 15:21:11 -0600
Subject: [PATCH] don't use concat, fixes long standing bug

---
 src/emulator.cpp               |  3 ++-
 src/qt_gui/gui_context_menus.h | 22 +++++++++-------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/emulator.cpp b/src/emulator.cpp
index dea8c2235..215b67fe3 100644
--- a/src/emulator.cpp
+++ b/src/emulator.cpp
@@ -106,7 +106,8 @@ Emulator::~Emulator() {
 void Emulator::Run(const std::filesystem::path& file) {
 
     // Use the eboot from the separated updates folder if it's there
-    std::filesystem::path game_patch_folder = file.parent_path().concat("-UPDATE");
+    std::filesystem::path game_patch_folder = file.parent_path();
+    game_patch_folder += "-UPDATE";
     bool use_game_patch = std::filesystem::exists(game_patch_folder / "sce_sys");
     std::filesystem::path eboot_path = std::filesystem::exists(game_patch_folder / file.filename())
                                            ? game_patch_folder / file.filename()
diff --git a/src/qt_gui/gui_context_menus.h b/src/qt_gui/gui_context_menus.h
index 6eef1230c..3cc12c11e 100644
--- a/src/qt_gui/gui_context_menus.h
+++ b/src/qt_gui/gui_context_menus.h
@@ -122,11 +122,11 @@ public:
 
         if (selected == &openSfoViewer) {
             PSF psf;
-            QString game_update_path;
-            Common::FS::PathToQString(game_update_path, m_games[itemID].path.concat("-UPDATE"));
             std::filesystem::path game_folder_path = m_games[itemID].path;
-            if (std::filesystem::exists(Common::FS::PathFromQString(game_update_path))) {
-                game_folder_path = Common::FS::PathFromQString(game_update_path);
+            std::filesystem::path game_update_path = game_folder_path;
+            game_update_path += "UPDATE";
+            if (std::filesystem::exists(game_update_path)) {
+                game_folder_path = game_update_path;
             }
             if (psf.Open(game_folder_path / "sce_sys" / "param.sfo")) {
                 int rows = psf.GetEntries().size();
@@ -320,21 +320,17 @@ public:
             bool error = false;
             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"));
+            game_update_path = folder_path + "-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(nullptr, tr("Error"),
-                                          QString(tr("requiresEnableSeparateUpdateFolder_MSG")));
-                    error = true;
-                } 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!")));
+                if (!std::filesystem::exists(Common::FS::PathFromQString(game_update_path))) {
+                    QMessageBox::critical(
+                        nullptr, tr("Error"),
+                        QString(tr("This game has no separate update to delete!")));
                     error = true;
                 } else {
                     folder_path = game_update_path;