diff options
Diffstat (limited to 'src/frontend')
| -rw-r--r-- | src/frontend/qt_sdl/EmuSettingsDialog.cpp | 4 | ||||
| -rw-r--r-- | src/frontend/qt_sdl/main.cpp | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/frontend/qt_sdl/EmuSettingsDialog.cpp b/src/frontend/qt_sdl/EmuSettingsDialog.cpp index 64950e8..dc7eaf5 100644 --- a/src/frontend/qt_sdl/EmuSettingsDialog.cpp +++ b/src/frontend/qt_sdl/EmuSettingsDialog.cpp @@ -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'; diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp index 4f90ebe..e7f35c2 100644 --- a/src/frontend/qt_sdl/main.cpp +++ b/src/frontend/qt_sdl/main.cpp @@ -1662,11 +1662,10 @@ void MainWindow::onOpenEmuSettings() void MainWindow::onEmuSettingsDialogFinished(int res) { + emuThread->emuUnpause(); + if (EmuSettingsDialog::needsReset) - { - emuThread->emuUnpause(); onReset(); - } } void MainWindow::onOpenInputConfig() |