From ab4189998cc2cbf2ef2ce7eedd0d3b43b6baabda Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sat, 7 Mar 2020 22:27:40 +0100 Subject: [PATCH] Qt: don't create stupid default.ini file when resetting gui configs --- rpcs3/rpcs3qt/gui_settings.cpp | 2 +- rpcs3/rpcs3qt/settings.h | 2 ++ rpcs3/rpcs3qt/settings_dialog.cpp | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rpcs3/rpcs3qt/gui_settings.cpp b/rpcs3/rpcs3qt/gui_settings.cpp index bc7fcc1bdb..fd4c5b44a6 100644 --- a/rpcs3/rpcs3qt/gui_settings.cpp +++ b/rpcs3/rpcs3qt/gui_settings.cpp @@ -304,7 +304,7 @@ QStringList gui_settings::GetStylesheetEntries() #else QDir platformStylesheetDir = QCoreApplication::applicationDirPath() + "/../share/rpcs3/GuiConfigs/"; #endif - res.append(gui::utils::get_dir_entries(platformStylesheetDir, nameFilter)); + res.append(gui::utils::get_dir_entries(platformStylesheetDir, name_filter)); res.removeDuplicates(); #endif res.sort(Qt::CaseInsensitive); diff --git a/rpcs3/rpcs3qt/settings.h b/rpcs3/rpcs3qt/settings.h index aeaa973848..695d4d91e9 100644 --- a/rpcs3/rpcs3qt/settings.h +++ b/rpcs3/rpcs3qt/settings.h @@ -5,6 +5,8 @@ #include #include +#include + struct gui_save { QString key; diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index 3e4ac4c9fb..c8c51592da 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -1608,7 +1608,6 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std { apply_gui_options(true); m_gui_settings->Reset(true); - m_gui_settings->ChangeToConfig(gui::Default); Q_EMIT GuiSettingsSyncRequest(true); AddConfigs(); AddStylesheets();