ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix similar bug with emu settings dialog 

also make the reset-warning dialog a bit betterer
This commit is contained in:
Arisotura 2020-07-31 20:51:16 +02:00
parent d21cd20290
commit c5ecef7410
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontend/qt_sdl/EmuSettingsDialog.cpp
View File

@ -165,8 +165,8 @@ void EmuSettingsDialog::done(int r)
{
if (RunningSomething
&& QMessageBox::warning(this, "Reset necessary to apply changes",
"The emulation will be reset for the changes to take place",
QMessageBox::Yes, QMessageBox::Cancel) != QMessageBox::Yes)
"The emulation will be reset for the changes to take place.",
QMessageBox::Ok, QMessageBox::Cancel) != QMessageBox::Ok)
return;
strncpy(Config::BIOS9Path, bios9Path.c_str(), 1023); Config::BIOS9Path[1023] = '\0';

5
src/frontend/qt_sdl/main.cpp
View File

@ -1662,11 +1662,10 @@ void MainWindow::onOpenEmuSettings()
void MainWindow::onEmuSettingsDialogFinished(int res)
{
emuThread->emuUnpause();
if (EmuSettingsDialog::needsReset)
{
emuThread->emuUnpause();
onReset();
}
}
void MainWindow::onOpenInputConfig()