preserve-emulation/simple64
1
0 Fork 0
mirror of https://github.com/simple64/simple64.git synced 2026-11-12 19:38:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

update gliden64

Browse Source
This commit is contained in:
Logan McNaughton committed 2020-10-05 08:30:13 -07:00
1 parent 0f8f4db2ee
commit 4ed2f85683
2 files changed
+15 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

GLideN64/src/GLideNUI/ConfigDialog.cpp
+9 -2
View File
@@ -10,6 +10,7 @@
#include <QRegExpValidator>
#include <QInputDialog>
#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);
GLideN64/src/GLideNUI/GLideNUI.cpp
+6 -1
View File
@@ -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<QApplication> pQApp;
QCoreApplication* pApp = QCoreApplication::instance();