citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Pause in background guard clause and unused flag

This commit is contained in:
vitor-k 2019-09-15 01:08:12 -03:00
parent 66b1e419c3
commit 05b1cfc63b
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/citra_qt/configuration/configure_general.ui
View File

@ -32,7 +32,7 @@
<item> <item>
<widget class="QCheckBox" name="toggle_background_pause"> <widget class="QCheckBox" name="toggle_background_pause">
<property name="text"> <property name="text">
<string>Pause emulation when on background</string> <string>Pause emulation when in background</string>
</property> </property>
</widget> </widget>
</item> </item>

8
src/citra_qt/main.cpp
View File

@ -500,10 +500,11 @@ void GMainWindow::RestoreUIState() {
} }
void GMainWindow::OnAppFocusStateChanged(Qt::ApplicationState state) { void GMainWindow::OnAppFocusStateChanged(Qt::ApplicationState state) {
if (UISettings::values.pause_when_in_background) { if (!UISettings::values.pause_when_in_background) {
return;
}
if (ui.action_Pause->isEnabled() && if (ui.action_Pause->isEnabled() &&
(state == Qt::ApplicationSuspended || (state & (Qt::ApplicationHidden | Qt::ApplicationInactive))) {
state & (Qt::ApplicationHidden | Qt::ApplicationInactive))) {
auto_paused = true; auto_paused = true;
OnPauseGame(); OnPauseGame();
} }
@ -512,7 +513,6 @@ void GMainWindow::OnAppFocusStateChanged(Qt::ApplicationState state) {
OnStartGame(); OnStartGame();
} }
} }
}
void GMainWindow::ConnectWidgetEvents() { void GMainWindow::ConnectWidgetEvents() {
connect(game_list, &GameList::GameChosen, this, &GMainWindow::OnGameListLoadFile); connect(game_list, &GameList::GameChosen, this, &GMainWindow::OnGameListLoadFile);