From 5b6fb3bf510b0a019d6d91baf6e383317f150dea Mon Sep 17 00:00:00 2001 From: Bixilon Date: Mon, 18 Sep 2023 20:05:37 +0200 Subject: [PATCH] boot crash: wait for javafx toolkit 10 times Now the crash screen should be properly visible on early boot crashes --- .../minosoft/gui/eros/crash/ErosCrashReport.kt | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/crash/ErosCrashReport.kt b/src/main/java/de/bixilon/minosoft/gui/eros/crash/ErosCrashReport.kt index aa92785f8..ec032de34 100644 --- a/src/main/java/de/bixilon/minosoft/gui/eros/crash/ErosCrashReport.kt +++ b/src/main/java/de/bixilon/minosoft/gui/eros/crash/ErosCrashReport.kt @@ -147,7 +147,19 @@ class ErosCrashReport : JavaFXWindowController() { } } - JavaFXInitializer.await() + for (i in 0 until 10) { + try { + JavaFXInitializer.await() + } catch (error: InterruptedException) { + continue + } + break + } + if (!JavaFXInitializer.initialized) { + Log.log(LogMessageType.JAVAFX, LogLevels.FATAL) { "JavaFX Toolkit still not initialized, can't wait longer. Exit!" } + ShutdownManager.shutdown(reason = AbstractShutdownReason.CRASH) + return + } JavaFXUtil.runLater { val fxmlLoader = FXMLLoader(ErosCrashReport::class.java.getResource("/assets/minosoft/eros/crash/crash_screen.fxml"))