octo
/
yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6997 from ameerj/stop-emulation-confirmation 

main: Apply confirm exit setting in exit locked scenarios
This commit is contained in:
Morph 2021-09-12 12:01:57 -04:00 committed by GitHub
parent 3428232bca 188cf1aed2
commit 9907302465
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/yuzu/main.cpp
View File

@ -3174,12 +3174,11 @@ std::optional<u64> GMainWindow::SelectRomFSDumpTarget(const FileSys::ContentProv
} }
bool GMainWindow::ConfirmClose() { bool GMainWindow::ConfirmClose() {
if (emu_thread == nullptr || !UISettings::values.confirm_before_closing) if (emu_thread == nullptr || !UISettings::values.confirm_before_closing) {
return true; return true;
}
QMessageBox::StandardButton answer = const auto text = tr("Are you sure you want to close yuzu?");
QMessageBox::question(this, tr("yuzu"), tr("Are you sure you want to close yuzu?"), const auto answer = QMessageBox::question(this, tr("yuzu"), text);
QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
return answer != QMessageBox::No; return answer != QMessageBox::No;
} }
@ -3261,14 +3260,13 @@ bool GMainWindow::ConfirmChangeGame() {
} }
bool GMainWindow::ConfirmForceLockedExit() { bool GMainWindow::ConfirmForceLockedExit() {
if (emu_thread == nullptr) if (emu_thread == nullptr || !UISettings::values.confirm_before_closing) {
return true; return true;
}
const auto text = tr("The currently running application has requested yuzu to not exit.\n\n"
"Would you like to bypass this and exit anyway?");
const auto answer = const auto answer = QMessageBox::question(this, tr("yuzu"), text);
QMessageBox::question(this, tr("yuzu"),
tr("The currently running application has requested yuzu to not "
"exit.\n\nWould you like to bypass this and exit anyway?"),
QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
return answer != QMessageBox::No; return answer != QMessageBox::No;
} }