diff --git a/GLideN64/src/GLideNUI/ConfigDialog.cpp b/GLideN64/src/GLideNUI/ConfigDialog.cpp index c2e42c7..cb74506 100644 --- a/GLideN64/src/GLideNUI/ConfigDialog.cpp +++ b/GLideN64/src/GLideNUI/ConfigDialog.cpp @@ -10,6 +10,7 @@ #include #include +#include "../PluginAPI.h" #include "../Config.h" #include "../DebugDump.h" #include "ui_configDialog.h" @@ -73,7 +74,9 @@ void ConfigDialog::_init(bool reInit, bool blockCustomSettings) m_blockReInit = true; if (reInit && m_romName != nullptr && ui->customSettingsCheckBox->isChecked() && ui->settingsDestGameRadioButton->isChecked()) { - loadCustomRomSettings(m_strIniPath, m_romName); + wchar_t strCustomFolderPath[PLUGIN_PATH_SIZE]; + api().FindPluginPath(strCustomFolderPath); + loadCustomRomSettings(QString::fromWCharArray(strCustomFolderPath), m_romName); } else if (reInit) { loadSettings(m_strIniPath); } @@ -643,7 +646,11 @@ void ConfigDialog::accept(bool justSave) { config.debug.dumpMode |= DEBUG_DETAIL; if (config.generalEmulation.enableCustomSettings && ui->settingsDestGameRadioButton->isChecked() && m_romName != nullptr) - saveCustomRomSettings(m_strIniPath, m_romName); + { + wchar_t strCustomFolderPath[PLUGIN_PATH_SIZE]; + api().FindPluginPath(strCustomFolderPath); + saveCustomRomSettings(QString::fromWCharArray(strCustomFolderPath), m_romName); + } else writeSettings(m_strIniPath); diff --git a/GLideN64/src/GLideNUI/GLideNUI.cpp b/GLideN64/src/GLideNUI/GLideNUI.cpp index c3a1258..734c4d2 100644 --- a/GLideN64/src/GLideNUI/GLideNUI.cpp +++ b/GLideN64/src/GLideNUI/GLideNUI.cpp @@ -6,6 +6,7 @@ #include "AboutDialog.h" #include "ConfigDialog.h" #include "Settings.h" +#include "../PluginAPI.h" #include "../Config.h" #ifdef QT_STATICPLUGIN @@ -27,7 +28,11 @@ int openConfigDialog(const wchar_t * _strFileName, const char * _romName, bool & QString strIniFileName = QString::fromWCharArray(_strFileName); loadSettings(strIniFileName); if (config.generalEmulation.enableCustomSettings != 0 && _romName != nullptr && strlen(_romName) != 0) - loadCustomRomSettings(strIniFileName, _romName); + { + wchar_t strCustomFolderPath[PLUGIN_PATH_SIZE]; + api().FindPluginPath(strCustomFolderPath); + loadCustomRomSettings(QString::fromWCharArray(strCustomFolderPath), _romName); + } std::unique_ptr pQApp; QCoreApplication* pApp = QCoreApplication::instance();