ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Android: Don't queue up multiple rescans before directory initialization

This commit is contained in:
JosJuice 2021-02-20 20:54:47 +01:00
parent dbcdead04d
commit cad4548b27
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java
View File

@ -80,6 +80,8 @@ public final class MainActivity extends AppCompatActivity implements MainView
{ {
super.onResume(); super.onResume();
boolean cacheAlreadyLoading = GameFileCacheService.isLoading();
if (DirectoryInitialization.shouldStart(this)) if (DirectoryInitialization.shouldStart(this))
{ {
DirectoryInitialization.start(this); DirectoryInitialization.start(this);
@ -93,15 +95,13 @@ public final class MainActivity extends AppCompatActivity implements MainView
// such as system language, cover downloading... // such as system language, cover downloading...
forEachPlatformGamesView(PlatformGamesView::refetchMetadata); forEachPlatformGamesView(PlatformGamesView::refetchMetadata);
if (sShouldRescanLibrary) if (sShouldRescanLibrary && !cacheAlreadyLoading)
{ {
GameFileCacheService.startRescan(this); GameFileCacheService.startRescan(this);
} }
else
{
sShouldRescanLibrary = true; sShouldRescanLibrary = true;
} }
}
@Override @Override
protected void onDestroy() protected void onDestroy()

8
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java
View File

@ -68,6 +68,8 @@ public final class TvMainActivity extends FragmentActivity implements MainView
{ {
super.onResume(); super.onResume();
boolean cacheAlreadyLoading = GameFileCacheService.isLoading();
if (DirectoryInitialization.shouldStart(this)) if (DirectoryInitialization.shouldStart(this))
{ {
DirectoryInitialization.start(this); DirectoryInitialization.start(this);
@ -80,15 +82,13 @@ public final class TvMainActivity extends FragmentActivity implements MainView
// such as system language, cover downloading... // such as system language, cover downloading...
refetchMetadata(); refetchMetadata();
if (sShouldRescanLibrary) if (sShouldRescanLibrary && !cacheAlreadyLoading)
{ {
GameFileCacheService.startRescan(this); GameFileCacheService.startRescan(this);
} }
else
{
sShouldRescanLibrary = true; sShouldRescanLibrary = true;
} }
}
@Override @Override
protected void onDestroy() protected void onDestroy()