qt: remove duplicate exit confirmation setting
This commit is contained in:
parent
c60204e255
commit
6a7123826a
|
@ -156,7 +156,6 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QWidget* parent) {
|
||||||
// Ui General
|
// Ui General
|
||||||
INSERT(UISettings, select_user_on_boot, "Prompt for user on game boot", "");
|
INSERT(UISettings, select_user_on_boot, "Prompt for user on game boot", "");
|
||||||
INSERT(UISettings, pause_when_in_background, "Pause emulation when in background", "");
|
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, confirm_before_stopping, "Confirm before stopping emulation", "");
|
||||||
INSERT(UISettings, hide_mouse, "Hide mouse on inactivity", "");
|
INSERT(UISettings, hide_mouse, "Hide mouse on inactivity", "");
|
||||||
INSERT(UISettings, controller_applet_disabled, "Disable controller applet", "");
|
INSERT(UISettings, controller_applet_disabled, "Disable controller applet", "");
|
||||||
|
|
|
@ -2174,6 +2174,7 @@ void GMainWindow::ShutdownGame() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
play_time_manager->Stop();
|
||||||
OnShutdownBegin();
|
OnShutdownBegin();
|
||||||
OnEmulationStopTimeExpired();
|
OnEmulationStopTimeExpired();
|
||||||
OnEmulationStopped();
|
OnEmulationStopped();
|
||||||
|
@ -3484,7 +3485,7 @@ void GMainWindow::OnExecuteProgram(std::size_t program_index) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void GMainWindow::OnExit() {
|
void GMainWindow::OnExit() {
|
||||||
OnStopGame();
|
ShutdownGame();
|
||||||
}
|
}
|
||||||
|
|
||||||
void GMainWindow::OnSaveConfig() {
|
void GMainWindow::OnSaveConfig() {
|
||||||
|
@ -4847,7 +4848,12 @@ bool GMainWindow::SelectRomFSDumpTarget(const FileSys::ContentProvider& installe
|
||||||
}
|
}
|
||||||
|
|
||||||
bool GMainWindow::ConfirmClose() {
|
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;
|
return true;
|
||||||
}
|
}
|
||||||
const auto text = tr("Are you sure you want to close yuzu?");
|
const auto text = tr("Are you sure you want to close yuzu?");
|
||||||
|
@ -4952,7 +4958,7 @@ bool GMainWindow::ConfirmChangeGame() {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool GMainWindow::ConfirmForceLockedExit() {
|
bool GMainWindow::ConfirmForceLockedExit() {
|
||||||
if (emu_thread == nullptr || !UISettings::values.confirm_before_closing) {
|
if (emu_thread == nullptr) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
const auto text = tr("The currently running application has requested yuzu to not exit.\n\n"
|
const auto text = tr("The currently running application has requested yuzu to not exit.\n\n"
|
||||||
|
|
|
@ -93,10 +93,6 @@ struct Values {
|
||||||
Setting<bool> show_filter_bar{linkage, true, "showFilterBar", Category::Ui};
|
Setting<bool> show_filter_bar{linkage, true, "showFilterBar", Category::Ui};
|
||||||
Setting<bool> show_status_bar{linkage, true, "showStatusBar", 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,
|
SwitchableSetting<ConfirmStop> confirm_before_stopping{linkage,
|
||||||
ConfirmStop::Ask_Always,
|
ConfirmStop::Ask_Always,
|
||||||
"confirmStop",
|
"confirmStop",
|
||||||
|
|
Reference in New Issue