Fix #9353: [Script] Garbage collecting on priority queues could crash the game

2021-06-12 16:45:26 +02:00
parent 40cec34836
commit 71f3c35288
2 changed files with 6 additions and 3 deletions
--- a/src/script/script_instance.cpp
+++ b/src/script/script_instance.cpp
@@ -254,9 +254,12 @@ void ScriptInstance::GameLoop()
 	}
 }

-void ScriptInstance::CollectGarbage() const
+void ScriptInstance::CollectGarbage()
 {
-	if (this->is_started && !this->IsDead()) this->engine->CollectGarbage();
+	if (this->is_started && !this->IsDead()) {
+		ScriptObject::ActiveInstance active(this);
+		this->engine->CollectGarbage();
+	}
 }

 /* static */ void ScriptInstance::DoCommandReturn(ScriptInstance *instance)