Consider more UI elements as loading screens
authorLiza Carvelli <liza@carvel.li>
Thu, 8 Aug 2024 23:25:47 +0000 (01:25 +0200)
committerLiza Carvelli <liza@carvel.li>
Thu, 8 Aug 2024 23:26:00 +0000 (01:26 +0200)
Questionable/Functions/GameFunctions.cs

index d52dd46973c7ce8a1d35b1a755522f3d44b5729f..4b0b5e13a09b0c877d6a3844e9cbf314918b7a2f 100644 (file)
@@ -486,9 +486,16 @@ internal sealed unsafe class GameFunctions
 
     public bool IsLoadingScreenVisible()
     {
-        return _gameGui.TryGetAddonByName("FadeMiddle", out AtkUnitBase* fade) &&
-               LAddon.IsAddonReady(fade) &&
-               fade->IsVisible;
+        if (_gameGui.TryGetAddonByName("FadeMiddle", out AtkUnitBase* fade) && fade->IsVisible)
+            return true;
+
+        if (_gameGui.TryGetAddonByName("FadeBack", out fade) && fade->IsVisible)
+            return true;
+
+        if (_gameGui.TryGetAddonByName("NowLoading", out fade) && fade->IsVisible)
+            return true;
+
+        return false;
     }
 
     public int GetFreeInventorySlots()