From 9e3fdedaff1bdc123a8bbe60bf2d98413112a603 Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Fri, 18 Dec 2020 12:03:26 +0700 Subject: [PATCH] Updates --- app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java | 1 + .../main/java/net/kdt/pojavlaunch/PojavLoginActivity.java | 2 ++ .../pojavlaunch/customcontrols/handleview/HandleView.java | 6 +++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java b/app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java index d96018fdf..bfdab191f 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java @@ -99,6 +99,7 @@ public class BaseMainActivity extends LoggableActivity { private LinearLayout contentCanvas; private AWTSurfaceView contentCanvasView; */ + private boolean resuming; private boolean lastEnabled = false; private boolean lastGrab = false; private boolean isExited = false; diff --git a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java index e76745514..da4346c85 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java @@ -298,7 +298,9 @@ public class PojavLoginActivity extends BaseActivity } private void initMain() throws Throwable { + mkdirs(Tools.DIR_ACCOUNT_NEW); PojavMigrator.migrateAccountData(this); + if (!PojavMigrator.migrateGameDir()) { mkdirs(Tools.DIR_GAME_NEW); mkdirs(Tools.DIR_GAME_NEW + "/config"); diff --git a/app/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/HandleView.java b/app/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/HandleView.java index 82275aa0a..3dfe05c73 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/HandleView.java +++ b/app/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/HandleView.java @@ -196,7 +196,11 @@ public abstract class HandleView extends View implements ViewPositionListener, V if (mActionPopupShower == null) { mActionPopupShower = new Runnable() { public void run() { - mActionPopupWindow.show(); + try { + mActionPopupWindow.show(); + } catch (Throwable th) { + th.printStackTrace(); + } } }; } else {