From e53a30c77e4645514e886b2bc37432988ca69af4 Mon Sep 17 00:00:00 2001
From: Mathias-Boulay <mathiasboulay@free.fr>
Date: Sun, 20 Nov 2022 12:53:31 +0100
Subject: [PATCH] Workaround: The add account button always works from the main
 menu

---
 .../main/java/net/kdt/pojavlaunch/LauncherActivity.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/LauncherActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/LauncherActivity.java
index 0b8d1cfc4..b09bc3350 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/LauncherActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/LauncherActivity.java
@@ -81,10 +81,10 @@ public class LauncherActivity extends BaseActivity {
 
     /* Listener for the auth method selection screen */
     private final ExtraListener<Boolean> mSelectAuthMethod = (key, value) -> {
-        if(isFragmentVisible(SelectAuthFragment.TAG)
-                || isFragmentVisible(LocalLoginFragment.TAG)
-                || isFragmentVisible(MicrosoftLoginFragment.TAG)
-        ) return false;
+        Fragment fragment = getSupportFragmentManager().findFragmentById(mFragmentView.getId());
+        // Allow starting the add account only from the main menu, should it be moved to fragment itself ?
+        if(!(fragment instanceof MainMenuFragment)) return false;
+
         Tools.swapFragment(this, SelectAuthFragment.class, SelectAuthFragment.TAG, true, null);
         return false;
     };