From 564a945d220c6ccd6be30e7e75185c2dfb9adf62 Mon Sep 17 00:00:00 2001 From: kalaposfos13 <153381648+kalaposfos13@users.noreply.github.com> Date: Wed, 20 Nov 2024 19:12:27 +0100 Subject: [PATCH] Fixed mistakenly overwriting the last opened config with the default one if the GUI is opened multiple times in a session --- src/qt_gui/kbm_config_dialog.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qt_gui/kbm_config_dialog.cpp b/src/qt_gui/kbm_config_dialog.cpp index a340668a6..c808629d2 100644 --- a/src/qt_gui/kbm_config_dialog.cpp +++ b/src/qt_gui/kbm_config_dialog.cpp @@ -20,6 +20,8 @@ #include #include +QString previous_game = "default"; + EditorDialog::EditorDialog(QWidget* parent) : QDialog(parent) { setWindowTitle("Edit Config File"); @@ -76,7 +78,6 @@ EditorDialog::EditorDialog(QWidget* parent) : QDialog(parent) { void EditorDialog::loadFile(QString game) { - // to make sure the files and the directory do exist const auto config_file = Config::GetFoolproofKbmConfigFile(game.toStdString()); QFile file(config_file); @@ -92,7 +93,6 @@ void EditorDialog::loadFile(QString game) { void EditorDialog::saveFile(QString game) { - // to make sure the files and the directory do exist const auto config_file = Config::GetFoolproofKbmConfigFile(game.toStdString()); QFile file(config_file); @@ -166,6 +166,7 @@ bool EditorDialog::hasUnsavedChanges() { return editor->toPlainText() != originalConfig; } void EditorDialog::loadInstalledGames() { + previous_game = "default"; QStringList filePaths; for (const auto& installLoc : Config::getGameInstallDirs()) { QString installDir; @@ -179,9 +180,8 @@ void EditorDialog::loadInstalledGames() { } } } -QString previousGame = "default"; void EditorDialog::onGameSelectionChanged(const QString& game) { - saveFile(previousGame); + saveFile(previous_game); loadFile(gameComboBox->currentText()); // Reload file based on the selected game - previousGame = gameComboBox->currentText(); + previous_game = gameComboBox->currentText(); }