diff --git a/src/citra_qt/configuration/config.cpp b/src/citra_qt/configuration/config.cpp index ddcb71e3d..970dc7bca 100644 --- a/src/citra_qt/configuration/config.cpp +++ b/src/citra_qt/configuration/config.cpp @@ -384,6 +384,7 @@ void Config::ReadValues() { UISettings::values.first_start = ReadSetting("firstStart", true).toBool(); UISettings::values.callout_flags = ReadSetting("calloutFlags", 0).toUInt(); UISettings::values.show_console = ReadSetting("showConsole", false).toBool(); + UISettings::values.pause_when_on_background = ReadSetting("pauseWhenOnBackground", false).toBool(); qt_config->beginGroup("Multiplayer"); UISettings::values.nickname = ReadSetting("nickname", "").toString(); @@ -636,6 +637,7 @@ void Config::SaveValues() { WriteSetting("firstStart", UISettings::values.first_start, true); WriteSetting("calloutFlags", UISettings::values.callout_flags, 0); WriteSetting("showConsole", UISettings::values.show_console, false); + WriteSetting("pauseWhenOnBackground", UISettings::values.pause_when_on_background, false); qt_config->beginGroup("Multiplayer"); WriteSetting("nickname", UISettings::values.nickname, ""); diff --git a/src/citra_qt/configuration/configure_general.cpp b/src/citra_qt/configuration/configure_general.cpp index 7332d959a..2911c26fe 100644 --- a/src/citra_qt/configuration/configure_general.cpp +++ b/src/citra_qt/configuration/configure_general.cpp @@ -26,6 +26,7 @@ ConfigureGeneral::~ConfigureGeneral() = default; void ConfigureGeneral::SetConfiguration() { ui->toggle_check_exit->setChecked(UISettings::values.confirm_before_closing); + ui->toggle_background_pause->setChecked(UISettings::values.pause_when_on_background); ui->toggle_update_check->setChecked(UISettings::values.check_for_update_on_start); ui->toggle_auto_update->setChecked(UISettings::values.update_on_close); @@ -53,6 +54,7 @@ void ConfigureGeneral::ResetDefaults() { void ConfigureGeneral::ApplyConfiguration() { UISettings::values.confirm_before_closing = ui->toggle_check_exit->isChecked(); + UISettings::values.pause_when_on_background = ui->toggle_background_pause->isChecked(); UISettings::values.check_for_update_on_start = ui->toggle_update_check->isChecked(); UISettings::values.update_on_close = ui->toggle_auto_update->isChecked(); diff --git a/src/citra_qt/configuration/configure_general.ui b/src/citra_qt/configuration/configure_general.ui index 0e7933625..046169c3b 100644 --- a/src/citra_qt/configuration/configure_general.ui +++ b/src/citra_qt/configuration/configure_general.ui @@ -29,6 +29,13 @@ + + + + Pause emulation when on background + + + diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index a401ce2d9..eb8cc55c7 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -500,15 +500,17 @@ void GMainWindow::RestoreUIState() { } void GMainWindow::OnLoseFocus(Qt::ApplicationState state) { - if (ui.action_Pause->isEnabled() && - (state == Qt::ApplicationSuspended || - state & (Qt::ApplicationHidden | Qt::ApplicationInactive))) { - auto_paused = true; - OnPauseGame(); - } - if (ui.action_Start->isEnabled() && auto_paused && state == Qt::ApplicationActive) { - auto_paused = false; - OnStartGame(); + if (UISettings::values.pause_when_on_background) { + if (ui.action_Pause->isEnabled() && + (state == Qt::ApplicationSuspended || + state & (Qt::ApplicationHidden | Qt::ApplicationInactive))) { + auto_paused = true; + OnPauseGame(); + } + if (ui.action_Start->isEnabled() && auto_paused && state == Qt::ApplicationActive) { + auto_paused = false; + OnStartGame(); + } } } diff --git a/src/citra_qt/uisettings.h b/src/citra_qt/uisettings.h index 573b4d975..175c68a2b 100644 --- a/src/citra_qt/uisettings.h +++ b/src/citra_qt/uisettings.h @@ -72,6 +72,7 @@ struct Values { bool confirm_before_closing; bool first_start; + bool pause_when_on_background; bool updater_found; bool update_on_close;