VERY experimental Nintendo Switch 2 emulator
C++
qt: remove duplicate exit confirmation setting
Liame219f4a771aa
diff --git a/src/yuzu/configuration/shared_translation.cpp b/src/yuzu/configuration/shared_translation.cppindex 3fe448f27d..1434b1a561 100644--- a/src/yuzu/configuration/shared_translation.cpp+++ b/src/yuzu/configuration/shared_translation.cpp@@ -156,7 +156,6 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QWidget* parent) {// Ui GeneralINSERT(UISettings, select_user_on_boot, "Prompt for user on game boot", "");INSERT(UISettings, pause_when_in_background, "Pause emulation when in background", "");- INSERT(UISettings, confirm_before_closing, "Confirm exit while emulation is running", "");INSERT(UISettings, confirm_before_stopping, "Confirm before stopping emulation", "");INSERT(UISettings, hide_mouse, "Hide mouse on inactivity", "");INSERT(UISettings, controller_applet_disabled, "Disable controller applet", "");diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cppindex 0df163029b..2b430c40af 100644--- a/src/yuzu/main.cpp+++ b/src/yuzu/main.cpp@@ -2174,6 +2174,7 @@ void GMainWindow::ShutdownGame() {return;}+ play_time_manager->Stop();OnShutdownBegin();OnEmulationStopTimeExpired();OnEmulationStopped();@@ -3484,7 +3485,7 @@ void GMainWindow::OnExecuteProgram(std::size_t program_index) {}void GMainWindow::OnExit() {- OnStopGame();+ ShutdownGame();}void GMainWindow::OnSaveConfig() {@@ -4847,7 +4848,12 @@ bool GMainWindow::SelectRomFSDumpTarget(const FileSys::ContentProvider& installe}bool GMainWindow::ConfirmClose() {- if (emu_thread == nullptr || !UISettings::values.confirm_before_closing) {+ if (emu_thread == nullptr ||+ UISettings::values.confirm_before_stopping.GetValue() == ConfirmStop::Ask_Never) {+ return true;+ }+ if (!system->GetExitLocked() &&+ UISettings::values.confirm_before_stopping.GetValue() == ConfirmStop::Ask_Based_On_Game) {return true;}const auto text = tr("Are you sure you want to close yuzu?");@@ -4952,7 +4958,7 @@ bool GMainWindow::ConfirmChangeGame() {}bool GMainWindow::ConfirmForceLockedExit() {- if (emu_thread == nullptr || !UISettings::values.confirm_before_closing) {+ if (emu_thread == nullptr) {return true;}const auto text = tr("The currently running application has requested yuzu to not exit.\n\n"diff --git a/src/yuzu/uisettings.h b/src/yuzu/uisettings.hindex b62ff620ce..77d992c542 100644--- a/src/yuzu/uisettings.h+++ b/src/yuzu/uisettings.h@@ -93,10 +93,6 @@ struct Values {Setting<bool> show_filter_bar{linkage, true, "showFilterBar", Category::Ui};Setting<bool> show_status_bar{linkage, true, "showStatusBar", Category::Ui};- Setting<bool> confirm_before_closing{- linkage, true, "confirmClose", Category::UiGeneral, Settings::Specialization::Default,- true, true};-SwitchableSetting<ConfirmStop> confirm_before_stopping{linkage,ConfirmStop::Ask_Always,"confirmStop",