▼▼▼

- Probably fix race condition when clearing the cache - Unload unneeded launcher activity while in game
QuestCraftPlusPlus · Dec 13, 2021 · ad8d115 · ad8d115
1 parent 2478758
commit ad8d115
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
@@ -62,7 +62,6 @@ public class BaseMainActivity extends BaseActivity {
 
     protected void initLayout(int resId) {
         setContentView(resId);
-        ProfileAdapter.clearIconCache();
         try {
             Logger.getInstance().reset();
             // FIXME: is it safe fot multi thread?

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java
@@ -91,6 +91,8 @@ public PojavLauncherActivity() {
     protected void onDestroy() {
         ExtraCore.removeExtraListenerFromValue("back_preference", backPreferenceListener);
         super.onDestroy();
+        ProfileAdapter.clearIconCache();
+        Log.i("LauncherActivity","Destroyed!");
     }
 
     @Override

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloaderTask.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloaderTask.java
@@ -349,6 +349,8 @@ protected void onPostExecute(Throwable p1)
                 mainIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
                 mainIntent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
                 mActivity.startActivity(mainIntent);
+                mActivity.finish();
+                Log.i("ActCheck","mainActivity finishing="+mActivity.isFinishing()+", destroyed="+mActivity.isDestroyed());
             }
             catch (Throwable e) {
                 Tools.showError(mActivity, e);