AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-17 19:35:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

rendering: don't pause on quit

Browse Source 
This fixes a jvm crash when a rendering error occurs
This commit is contained in:
Bixilon 2022-11-14 11:07:52 +01:00
parent 89435bed4b
commit 08c26e8c3d
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt
View File

@ -206,7 +206,7 @@ class RenderWindow(
inputHandler.init() inputHandler.init()
DefaultKeyCombinations.registerAll(this) DefaultKeyCombinations.registerAll(this)
this::state.observe(this) { this::state.observe(this) {
if (it != RenderingStates.RUNNING) { if (it == RenderingStates.PAUSED || it == RenderingStates.SLOW || it == RenderingStates.STOPPED) {
pause(true) pause(true)
} }
} }

10
src/main/java/de/bixilon/minosoft/gui/rendering/system/window/BaseWindow.kt
View File

@ -19,6 +19,7 @@ import de.bixilon.minosoft.assets.AssetsManager
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatchRendering import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatchRendering
import de.bixilon.minosoft.config.profile.profiles.rendering.RenderingProfile import de.bixilon.minosoft.config.profile.profiles.rendering.RenderingProfile
import de.bixilon.minosoft.gui.rendering.RenderWindow import de.bixilon.minosoft.gui.rendering.RenderWindow
import de.bixilon.minosoft.gui.rendering.events.WindowCloseEvent
import de.bixilon.minosoft.terminal.RunConfiguration import de.bixilon.minosoft.terminal.RunConfiguration
import de.bixilon.minosoft.util.KUtil.toResourceLocation import de.bixilon.minosoft.util.KUtil.toResourceLocation
import de.matthiasmann.twl.utils.PNGDecoder import de.matthiasmann.twl.utils.PNGDecoder
@ -65,7 +66,14 @@ interface BaseWindow {
fun destroy() fun destroy()
fun close() fun close() {
if (fireGLFWEvent(WindowCloseEvent(renderWindow, window = this))) {
return
}
forceClose()
}
fun forceClose()
fun swapBuffers() fun swapBuffers()

6
src/main/java/de/bixilon/minosoft/gui/rendering/system/window/GLFWWindow.kt
View File

@ -247,11 +247,7 @@ class GLFWWindow(
glfwSetErrorCallback(null)?.free() glfwSetErrorCallback(null)?.free()
} }
override fun close() { override fun forceClose() {
if (fireGLFWEvent(WindowCloseEvent(renderWindow, window = this))) {
return
}
glfwSetWindowShouldClose(window, true) glfwSetWindowShouldClose(window, true)
} }