summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2021-09-12 18:01:57 +0200
committerGitHub <noreply@github.com>2021-09-12 18:01:57 +0200
commit990730246551fe4d3fc4679d46515a8efa3161d7 (patch)
tree4edde9fb8b767f5c1e31c05d0b31d2f428ba9ac2
parentMerge pull request #6992 from german77/brains (diff)
parentmain: Apply confirm exit setting in exit locked scenarios (diff)
downloadyuzu-990730246551fe4d3fc4679d46515a8efa3161d7.tar
yuzu-990730246551fe4d3fc4679d46515a8efa3161d7.tar.gz
yuzu-990730246551fe4d3fc4679d46515a8efa3161d7.tar.bz2
yuzu-990730246551fe4d3fc4679d46515a8efa3161d7.tar.lz
yuzu-990730246551fe4d3fc4679d46515a8efa3161d7.tar.xz
yuzu-990730246551fe4d3fc4679d46515a8efa3161d7.tar.zst
yuzu-990730246551fe4d3fc4679d46515a8efa3161d7.zip
-rw-r--r--src/yuzu/main.cpp20
1 files changed, 9 insertions, 11 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index e36774cc6..77d53e7bc 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -3174,12 +3174,11 @@ std::optional<u64> GMainWindow::SelectRomFSDumpTarget(const FileSys::ContentProv
}
bool GMainWindow::ConfirmClose() {
- if (emu_thread == nullptr || !UISettings::values.confirm_before_closing)
+ if (emu_thread == nullptr || !UISettings::values.confirm_before_closing) {
return true;
-
- QMessageBox::StandardButton answer =
- QMessageBox::question(this, tr("yuzu"), tr("Are you sure you want to close yuzu?"),
- QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
+ }
+ const auto text = tr("Are you sure you want to close yuzu?");
+ const auto answer = QMessageBox::question(this, tr("yuzu"), text);
return answer != QMessageBox::No;
}
@@ -3261,14 +3260,13 @@ bool GMainWindow::ConfirmChangeGame() {
}
bool GMainWindow::ConfirmForceLockedExit() {
- if (emu_thread == nullptr)
+ if (emu_thread == nullptr || !UISettings::values.confirm_before_closing) {
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 =
- 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);
+ const auto answer = QMessageBox::question(this, tr("yuzu"), text);
return answer != QMessageBox::No;
}