diff options
| author | JosJuice <josjuice@gmail.com> | 2021-02-20 20:54:47 +0100 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2021-02-20 21:04:00 +0100 |
| commit | cad4548b27e3a29c3d8945c967471b1d7b60fb70 (patch) | |
| tree | 9d90b573dbfdbdb4fb76410ab2b510e681b7d9d0 /Source/Android/app/src/main/java/org | |
| parent | dbcdead04d7ceeedc9f26a7ede2aeb69ce9be7df (diff) | |
Android: Don't queue up multiple rescans before directory initialization
Diffstat (limited to 'Source/Android/app/src/main/java/org')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java | 10 | ||||
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java index 1addf82258..f17265db91 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java @@ -80,6 +80,8 @@ public final class MainActivity extends AppCompatActivity implements MainView { super.onResume(); + boolean cacheAlreadyLoading = GameFileCacheService.isLoading(); + if (DirectoryInitialization.shouldStart(this)) { DirectoryInitialization.start(this); @@ -93,14 +95,12 @@ public final class MainActivity extends AppCompatActivity implements MainView // such as system language, cover downloading... forEachPlatformGamesView(PlatformGamesView::refetchMetadata); - if (sShouldRescanLibrary) + if (sShouldRescanLibrary && !cacheAlreadyLoading) { GameFileCacheService.startRescan(this); } - else - { - sShouldRescanLibrary = true; - } + + sShouldRescanLibrary = true; } @Override diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java index d34c3d8518..a568f47156 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java @@ -68,6 +68,8 @@ public final class TvMainActivity extends FragmentActivity implements MainView { super.onResume(); + boolean cacheAlreadyLoading = GameFileCacheService.isLoading(); + if (DirectoryInitialization.shouldStart(this)) { DirectoryInitialization.start(this); @@ -80,14 +82,12 @@ public final class TvMainActivity extends FragmentActivity implements MainView // such as system language, cover downloading... refetchMetadata(); - if (sShouldRescanLibrary) + if (sShouldRescanLibrary && !cacheAlreadyLoading) { GameFileCacheService.startRescan(this); } - else - { - sShouldRescanLibrary = true; - } + + sShouldRescanLibrary = true; } @Override |