Close launching progress dialog when game crashed before opening window
This commit is contained in:
@@ -454,6 +454,31 @@ public final class LauncherHelper {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void finishLaunch() {
|
||||||
|
switch (launcherVisibility) {
|
||||||
|
case HIDE_AND_REOPEN:
|
||||||
|
Platform.runLater(() -> {
|
||||||
|
Controllers.getStage().hide();
|
||||||
|
emitStatus(LoadingState.DONE);
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
case CLOSE:
|
||||||
|
// Never come to here.
|
||||||
|
break;
|
||||||
|
case KEEP:
|
||||||
|
Platform.runLater(() -> {
|
||||||
|
emitStatus(LoadingState.DONE);
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
case HIDE:
|
||||||
|
Platform.runLater(() -> {
|
||||||
|
Controllers.getStage().close();
|
||||||
|
emitStatus(LoadingState.DONE);
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public synchronized void onLog(String log, Log4jLevel level) {
|
public synchronized void onLog(String log, Log4jLevel level) {
|
||||||
String newLog = log;
|
String newLog = log;
|
||||||
@@ -483,28 +508,7 @@ public final class LauncherHelper {
|
|||||||
|
|
||||||
if (!lwjgl && (log.contains("LWJGL Version: ") || !detectWindow)) {
|
if (!lwjgl && (log.contains("LWJGL Version: ") || !detectWindow)) {
|
||||||
lwjgl = true;
|
lwjgl = true;
|
||||||
switch (launcherVisibility) {
|
finishLaunch();
|
||||||
case HIDE_AND_REOPEN:
|
|
||||||
Platform.runLater(() -> {
|
|
||||||
Controllers.getStage().hide();
|
|
||||||
emitStatus(LoadingState.DONE);
|
|
||||||
});
|
|
||||||
break;
|
|
||||||
case CLOSE:
|
|
||||||
// Never come to here.
|
|
||||||
break;
|
|
||||||
case KEEP:
|
|
||||||
Platform.runLater(() -> {
|
|
||||||
emitStatus(LoadingState.DONE);
|
|
||||||
});
|
|
||||||
break;
|
|
||||||
case HIDE:
|
|
||||||
Platform.runLater(() -> {
|
|
||||||
Controllers.getStage().close();
|
|
||||||
emitStatus(LoadingState.DONE);
|
|
||||||
});
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -513,6 +517,9 @@ public final class LauncherHelper {
|
|||||||
if (exitType == ExitType.INTERRUPTED)
|
if (exitType == ExitType.INTERRUPTED)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
// Game crashed before opening the game window.
|
||||||
|
if (!lwjgl) finishLaunch();
|
||||||
|
|
||||||
if (exitType != ExitType.NORMAL && logWindow == null)
|
if (exitType != ExitType.NORMAL && logWindow == null)
|
||||||
Platform.runLater(() -> {
|
Platform.runLater(() -> {
|
||||||
logWindow = new LogWindow();
|
logWindow = new LogWindow();
|
||||||
|
|||||||
Reference in New Issue
Block a user