Citra-emu/citra-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android/Settings: Set mStackCount to 0 when starting the Activity

Browse Source 
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.
This commit is contained in:
FearlessTobi 2020-04-29 06:45:36 +02:00 committed by bunnei
parent 481f8a8f8b
commit 0993d7cf18
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivity.java
View File

@ -27,8 +27,7 @@ public final class SettingsActivity extends AppCompatActivity implements Setting
private ProgressDialog dialog; 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); Intent settings = new Intent(context, SettingsActivity.class);
settings.putExtra(ARG_MENU_TAG, menuTag); settings.putExtra(ARG_MENU_TAG, menuTag);
settings.putExtra(ARG_GAME_ID, gameId); settings.putExtra(ARG_GAME_ID, gameId);

3
src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivityPresenter.java
View File

@ -45,6 +45,7 @@ public final class SettingsActivityPresenter {
} }
public void onStart() { public void onStart() {
this.mStackCount = 0;
prepareCitraDirectoriesIfNeeded(); prepareCitraDirectoriesIfNeeded();
} }
@ -64,7 +65,7 @@ public final class SettingsActivityPresenter {
private void prepareCitraDirectoriesIfNeeded() { private void prepareCitraDirectoriesIfNeeded() {
File configFile = new File(DirectoryInitialization.getUserDirectory() + "/config/" + SettingsFile.FILE_NAME_CONFIG + ".ini"); File configFile = new File(DirectoryInitialization.getUserDirectory() + "/config/" + SettingsFile.FILE_NAME_CONFIG + ".ini");
if (!configFile.exists()) { if (!configFile.exists()) {
Log.error("Citra config file could not be found!");
} }
if (DirectoryInitialization.areCitraDirectoriesReady()) { if (DirectoryInitialization.areCitraDirectoriesReady()) {
loadSettingsUI(); loadSettingsUI();