fix similar bug with emu settings dialog
also make the reset-warning dialog a bit betterer
This commit is contained in:
parent
d21cd20290
commit
c5ecef7410
|
@ -165,8 +165,8 @@ void EmuSettingsDialog::done(int r)
|
||||||
{
|
{
|
||||||
if (RunningSomething
|
if (RunningSomething
|
||||||
&& QMessageBox::warning(this, "Reset necessary to apply changes",
|
&& QMessageBox::warning(this, "Reset necessary to apply changes",
|
||||||
"The emulation will be reset for the changes to take place",
|
"The emulation will be reset for the changes to take place.",
|
||||||
QMessageBox::Yes, QMessageBox::Cancel) != QMessageBox::Yes)
|
QMessageBox::Ok, QMessageBox::Cancel) != QMessageBox::Ok)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
strncpy(Config::BIOS9Path, bios9Path.c_str(), 1023); Config::BIOS9Path[1023] = '\0';
|
strncpy(Config::BIOS9Path, bios9Path.c_str(), 1023); Config::BIOS9Path[1023] = '\0';
|
||||||
|
|
|
@ -1662,11 +1662,10 @@ void MainWindow::onOpenEmuSettings()
|
||||||
|
|
||||||
void MainWindow::onEmuSettingsDialogFinished(int res)
|
void MainWindow::onEmuSettingsDialogFinished(int res)
|
||||||
{
|
{
|
||||||
|
emuThread->emuUnpause();
|
||||||
|
|
||||||
if (EmuSettingsDialog::needsReset)
|
if (EmuSettingsDialog::needsReset)
|
||||||
{
|
|
||||||
emuThread->emuUnpause();
|
|
||||||
onReset();
|
onReset();
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::onOpenInputConfig()
|
void MainWindow::onOpenInputConfig()
|
||||||
|
|
Loading…
Reference in New Issue