crash: don't show eros, don't kill thread pool, destroy rendering windows

Author: Bixilon

src/main/java/de/bixilon/minosoft/gui/eros/Eros.kt

@@ -1,6 +1,6 @@
 /*
  * Minosoft
- * Copyright (C) 2020-2023 Moritz Zwerger
+ * Copyright (C) 2020-2025 Moritz Zwerger
  *
  * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
  *
@@ -21,6 +21,7 @@ import de.bixilon.kutil.observer.DataObserver.Companion.observe
 import de.bixilon.minosoft.config.profile.profiles.eros.ErosProfileManager
 import de.bixilon.minosoft.config.profile.profiles.other.OtherProfileManager
 import de.bixilon.minosoft.data.registries.identified.Namespaces.i18n
+import de.bixilon.minosoft.gui.eros.crash.CrashReportState
 import de.bixilon.minosoft.gui.eros.dialog.UpdateAvailableDialog
 import de.bixilon.minosoft.gui.eros.dialog.simple.ConfirmationDialog
 import de.bixilon.minosoft.gui.eros.main.MainErosController
@@ -59,12 +60,10 @@ object Eros {
 
     @Synchronized
     fun setVisibility(visible: Boolean) {
-        if (visible == this.visible) {
-            return
-        }
-        if (!initialized) {
-            return
-        }
+        if (visible == this.visible) return
+        if (CrashReportState.crashed) return
+        if (!initialized) return
+
         if (visible) {
             mainErosController.stage.show()
         } else {

src/main/java/de/bixilon/minosoft/gui/eros/crash/ErosCrashReport.kt

@@ -14,7 +14,6 @@
 package de.bixilon.minosoft.gui.eros.crash
 
 import de.bixilon.kutil.collections.CollectionUtil.toSynchronizedSet
-import de.bixilon.kutil.concurrent.pool.DefaultThreadPool
 import de.bixilon.kutil.exception.ExceptionUtil.catchAll
 import de.bixilon.kutil.exception.ExceptionUtil.toStackTrace
 import de.bixilon.kutil.file.FileUtil.div
@@ -102,19 +101,20 @@ class ErosCrashReport : JavaFXWindowController() {
                 error.toStackTrace()
             }
 
-            // Kill some stuff
-            catchAll(executor = { DefaultThreadPool.shutdownNow() })
-            catchAll(executor = { FileWatcherService.stop() })
-            catchAll(executor = {
-                for (window in Window.getWindows().toSynchronizedSet()) {
-                    JavaFXUtil.runLater { window.hide() }
-                }
-            })
-            catchAll(executor = {
+            catchAll {
                 for (session in PlaySession.ACTIVE_CONNECTIONS.toSynchronizedSet()) {
                     session.terminate()
+                    session.rendering?.context?.window?.destroy()
                 }
-            })
+            }
+            catchAll {
+                for (window in Window.getWindows().toSynchronizedSet()) {
+                    JavaFXUtil.runLater { window.hide() }
+                }
+            }
+
+            // Kill some stuff
+            catchAll { FileWatcherService.stop() }
 
 
             var crashReportPath: File?

src/main/java/de/bixilon/minosoft/gui/rendering/RenderUtil.kt

@@ -20,6 +20,7 @@ import de.bixilon.kutil.concurrent.pool.runnable.SimplePoolRunnable
 import de.bixilon.minosoft.gui.eros.crash.ErosCrashReport.Companion.crash
 import de.bixilon.minosoft.gui.rendering.RenderConstants.UV_ADD
 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer
+import de.bixilon.minosoft.gui.rendering.system.window.CursorModes
 
 object RenderUtil {
 
@@ -33,6 +34,8 @@ object RenderUtil {
             try {
                 runnable()
             } catch (error: Throwable) {
+                window.cursorMode = CursorModes.NORMAL
+                window.destroy()
                 error.printStackTrace()
                 Exception("Exception in rendering: ${session.id}", error).crash()
             }