2
0
Эх сурвалжийг харах

Fixing crash on shutdown due to a GUIPanel being deallocated twice

BearishSun 10 жил өмнө
parent
commit
26e67880b5

+ 2 - 2
SBansheeEngine/Source/BsScriptObjectManager.cpp

@@ -59,13 +59,13 @@ namespace BansheeEngine
 			ScriptAssemblyManager::instance().loadAssemblyInfo(assemblyPair.first);
 			ScriptAssemblyManager::instance().loadAssemblyInfo(assemblyPair.first);
 		}
 		}
 
 
-		onRefreshDomainLoaded();
-
 		Vector<ScriptObjectBase*> scriptObjCopy(mScriptObjects.size()); // Store originals as we could add new objects during the next iteration
 		Vector<ScriptObjectBase*> scriptObjCopy(mScriptObjects.size()); // Store originals as we could add new objects during the next iteration
 		UINT32 idx = 0;
 		UINT32 idx = 0;
 		for (auto& scriptObject : mScriptObjects)
 		for (auto& scriptObject : mScriptObjects)
 			scriptObjCopy[idx++] = scriptObject;
 			scriptObjCopy[idx++] = scriptObject;
 
 
+		onRefreshDomainLoaded();
+
 		for (auto& scriptObject : scriptObjCopy)
 		for (auto& scriptObject : scriptObjCopy)
 			scriptObject->_restoreManagedInstance();
 			scriptObject->_restoreManagedInstance();