AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-09-17 15:57:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix NPE when the game launched and suddenly crashes

Browse Source
This commit is contained in:
huangyuhui 2018-06-30 21:36:57 +08:00
parent 75031a04cc
commit 34f7774ce9
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java
View File

@ -172,13 +172,17 @@ public final class LauncherHelper {
@Override @Override
public void onStop(boolean success, TaskExecutor executor) { public void onStop(boolean success, TaskExecutor executor) {
if (!success) { if (!success && !Controllers.isStopped()) {
Platform.runLater(() -> { Platform.runLater(() -> {
Controllers.closeDialog(launchingStepsPane); // Check if the application has stopped
if (executor.getLastException() != null) // because onStop will be invoked if tasks fail when the executor service shut down.
Controllers.dialog(I18nException.getStackTrace(executor.getLastException()), if (!Controllers.isStopped()) {
scriptFile == null ? Launcher.i18n("launch.failed") : Launcher.i18n("version.launch_script.failed"), Controllers.closeDialog(launchingStepsPane);
MessageBox.ERROR_MESSAGE); if (executor.getLastException() != null)
Controllers.dialog(I18nException.getStackTrace(executor.getLastException()),
scriptFile == null ? Launcher.i18n("launch.failed") : Launcher.i18n("version.launch_script.failed"),
MessageBox.ERROR_MESSAGE);
}
}); });
} }
launchingStepsPane.setExecutor(null); launchingStepsPane.setExecutor(null);

7
HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java
View File

@ -157,7 +157,8 @@ public final class Controllers {
} }
public static void closeDialog(Region content) { public static void closeDialog(Region content) {
if (stage == null) // shut down
return;
decorator.closeDialog(content); decorator.closeDialog(content);
} }
@ -174,6 +175,10 @@ public final class Controllers {
getLeftPaneController().showUpdate(); getLeftPaneController().showUpdate();
} }
public static boolean isStopped() {
return decorator == null;
}
public static void shutdown() { public static void shutdown() {
mainPage = null; mainPage = null;
settingsPage = null; settingsPage = null;