Fix crash when toggling GUIs too quickly

Twometer · Oct 12, 2021 · 263196b · 263196b
1 parent 2cab3cc
commit 263196b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/neko-engine/build.gradle b/neko-engine/build.gradle
@@ -7,7 +7,7 @@ plugins {
 }
 
 group 'de.twometer'
-version '2.3.3'
+version '2.3.4'
 
 /* Version configuration */
 project.ext.lwjglVersion = "3.2.3"

diff --git a/neko-engine/src/main/kotlin/de/twometer/neko/Neko.kt b/neko-engine/src/main/kotlin/de/twometer/neko/Neko.kt
@@ -2,6 +2,6 @@ package de.twometer.neko
 
 object Neko {
 
-    const val VERSION = "2.3.3"
+    const val VERSION = "2.3.4"
 
 }
diff --git a/neko-engine/src/main/kotlin/de/twometer/neko/gui/GuiManager.kt b/neko-engine/src/main/kotlin/de/twometer/neko/gui/GuiManager.kt
@@ -30,11 +30,17 @@ class GuiManager : UltralightLoadListener {
     private lateinit var view: UltralightView
     private lateinit var contextProvider: PageContextProvider
 
+    private val loadLock = Object()
     var finishedLoading: Boolean = false
         private set
 
     var page: Page? = null
         set(newVal) {
+            synchronized(loadLock) {
+                if (!finishedLoading && field != null)
+                    loadLock.wait()
+            }
+
             field?.onUnloaded()
             field = newVal
             finishedLoading = false
@@ -169,21 +175,26 @@ class GuiManager : UltralightLoadListener {
     }
 
     override fun onFinishLoading(frameId: Long, isMainFrame: Boolean, url: String?) {
-        finishedLoading = true
-
         page?.run {
             contextProvider.syncWithJavascript {
                 contextProvider.registerObject(it.context, "_remote", this)
                 for (global in globalObjects)
                     contextProvider.registerObject(it.context, global.key, global.value)
                 this.onLoaded()
                 runScript("if (typeof OnLoad !== 'undefined') { OnLoad(); }")
+
+                synchronized(loadLock) {
+                    finishedLoading = true
+                    loadLock.notifyAll()
+                }
             }
         }
     }
 
     override fun onBeginLoading(frameId: Long, isMainFrame: Boolean, url: String?) {
-        finishedLoading = false
+        synchronized(loadLock) {
+            finishedLoading = false
+        }
     }
 
     override fun onUpdateHistory() = Unit