From 2514407451d20d3184a30822e50b893a06b5377d Mon Sep 17 00:00:00 2001
From: JosJuice <josjuice@gmail.com>
Date: Mon, 3 Aug 2026 20:09:37 +0200
Subject: Android: Clean up setting rescanInProgress in GameFileCacheManager

We can avoid the workaround of setting rescanInProgress to true in
load() if we don't set it to false in rescan()'s early exit.
---
 .../org/dolphinemu/dolphinemu/services/GameFileCacheManager.kt | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'Source/Android/app/src/main/java')

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/GameFileCacheManager.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/GameFileCacheManager.kt
index 2ba2c246b3..1dad6107f3 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/GameFileCacheManager.kt
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/GameFileCacheManager.kt
@@ -175,12 +175,6 @@ object GameFileCacheManager {
             }
         }
 
-        if (runRescanAfterLoad) {
-            // Without this, there will be a short blip where the loading indicator in the GUI disappears
-            // because neither loadInProgress nor rescanInProgress is true
-            rescanInProgress.postValue(true)
-        }
-
         loadInProgress.postValue(false)
 
         if (runRescanAfterLoad) {
@@ -214,9 +208,9 @@ object GameFileCacheManager {
             if (changed || additionalMetadataChanged) {
                 gameFileCache!!.save()
             }
-        }
 
-        rescanInProgress.postValue(false)
+            rescanInProgress.postValue(false)
+        }
     }
 
     private fun updateGameFileArray() {
-- 
cgit v1.2.3