Clear Services Map during VM Shutdown

fgsfdsfgs · Jun 28, 2023 · 71d4eb6 · 71d4eb6
1 parent a8b8de9
commit 71d4eb6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/common/objects/dobjtype.cpp b/src/common/objects/dobjtype.cpp
@@ -231,13 +231,16 @@ void PClass::StaticInit ()
 //
 //==========================================================================
 
+void ClearServices();
+
 void PClass::StaticShutdown ()
 {
 	if (WP_NOCHANGE != nullptr)
 	{
 		delete WP_NOCHANGE;
 	}
 
+	ClearServices();
 	// delete all variables containing pointers to script functions.
 	for (auto p : FunctionPtrList)
 	{

diff --git a/src/common/scripting/interface/vmnatives.cpp b/src/common/scripting/interface/vmnatives.cpp
@@ -57,8 +57,8 @@
 
 static ZSMap<FName, DObject*> AllServices;
 
-static void MarkServices() {
-
+static void MarkServices()
+{
 	ZSMap<FName, DObject*>::Iterator it(AllServices);
 	ZSMap<FName, DObject*>::Pair* pair;
 	while (it.NextPair(pair))
@@ -82,6 +82,11 @@ void InitServices()
 	GC::AddMarkerFunc(&MarkServices);
 }
 
+void ClearServices()
+{
+	AllServices.Clear();
+}
+
 
 
 //==========================================================================