From 0993d7cf18ff273aadb4bd7a0ecce9b94593990d Mon Sep 17 00:00:00 2001
From: FearlessTobi <thm.frey@gmail.com>
Date: Wed, 29 Apr 2020 06:45:36 +0200
Subject: [PATCH] android/Settings: Set mStackCount to 0 when starting the
 Activity

Fixes a bug where you would have to click multiple times to get out of the settings after turning the screen off and on again.
---
 .../citra/citra_emu/features/settings/ui/SettingsActivity.java | 3 +--
 .../features/settings/ui/SettingsActivityPresenter.java        | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivity.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivity.java
index c497c07ed..1ce897119 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivity.java
+++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivity.java
@@ -27,8 +27,7 @@ public final class SettingsActivity extends AppCompatActivity implements Setting
 
     private ProgressDialog dialog;
 
-    public static void launch(Context context, String menuTag, String gameId)
-    {
+    public static void launch(Context context, String menuTag, String gameId) {
         Intent settings = new Intent(context, SettingsActivity.class);
         settings.putExtra(ARG_MENU_TAG, menuTag);
         settings.putExtra(ARG_GAME_ID, gameId);
diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivityPresenter.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivityPresenter.java
index a57c54535..cda6b6cb6 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivityPresenter.java
+++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivityPresenter.java
@@ -45,6 +45,7 @@ public final class SettingsActivityPresenter {
     }
 
     public void onStart() {
+        this.mStackCount = 0;
         prepareCitraDirectoriesIfNeeded();
     }
 
@@ -64,7 +65,7 @@ public final class SettingsActivityPresenter {
     private void prepareCitraDirectoriesIfNeeded() {
         File configFile = new File(DirectoryInitialization.getUserDirectory() + "/config/" + SettingsFile.FILE_NAME_CONFIG + ".ini");
         if (!configFile.exists()) {
-
+            Log.error("Citra config file could not be found!");
         }
         if (DirectoryInitialization.areCitraDirectoriesReady()) {
             loadSettingsUI();