From 05b1cfc63b58798d95f68632f26b349b44bd99e9 Mon Sep 17 00:00:00 2001
From: vitor-k <vitor-kiguchi@hotmail.com>
Date: Sun, 15 Sep 2019 01:08:12 -0300
Subject: [PATCH] Pause in background guard clause and unused flag

---
 .../configuration/configure_general.ui        |  2 +-
 src/citra_qt/main.cpp                         | 22 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/citra_qt/configuration/configure_general.ui b/src/citra_qt/configuration/configure_general.ui
index 046169c3b..74b9da7ad 100644
--- a/src/citra_qt/configuration/configure_general.ui
+++ b/src/citra_qt/configuration/configure_general.ui
@@ -32,7 +32,7 @@
        <item>
          <widget class="QCheckBox" name="toggle_background_pause">
           <property name="text">
-           <string>Pause emulation when on background</string>
+           <string>Pause emulation when in background</string>
           </property>
          </widget>
         </item>
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 9b2fc5253..45344126a 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -500,17 +500,17 @@ void GMainWindow::RestoreUIState() {
 }
 
 void GMainWindow::OnAppFocusStateChanged(Qt::ApplicationState state) {
-    if (UISettings::values.pause_when_in_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();
-        }
+    if (!UISettings::values.pause_when_in_background) {
+        return;
+    }
+    if (ui.action_Pause->isEnabled() &&
+        (state & (Qt::ApplicationHidden | Qt::ApplicationInactive))) {
+        auto_paused = true;
+        OnPauseGame();
+    }
+    if (ui.action_Start->isEnabled() && auto_paused && state == Qt::ApplicationActive) {
+        auto_paused = false;
+        OnStartGame();
     }
 }