diff --git a/app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java b/app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java index ab692a30c..5b54267a4 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java @@ -36,7 +36,6 @@ public class BaseMainActivity extends LoggableActivity { private int fingerStillThreshold = 8; private int initialX; private int initialY; - private boolean resuming; private static final int MSG_LEFT_MOUSE_BUTTON_CHECK = 1028; private static final int MSG_DROP_ITEM_BUTTON_CHECK = 1029; private static boolean triggeredLeftMouseButton = false; @@ -99,6 +98,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 {