Some cleanup. might as well do this all-in-one. Also fix crash with GC during script reload

Author: Causeless

Managers/LuaMan.cpp

@@ -395,11 +395,21 @@ namespace RTE {
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
     void LuaMan::ClearUserModuleCache() {
+		if (m_GCThread.joinable()) {
+			m_GCThread.join();
+		}
+
+		m_ScriptThreadSafetyMap.clear();
+
+		m_MasterScriptState.ClearLuaScriptCache();
+		for (LuaStateWrapper& luaState : m_ScriptStates) {
+			luaState.ClearLuaScriptCache();
+		}
+
 		m_MasterScriptState.ClearUserModuleCache();
-		for (LuaStateWrapper &luaState : m_ScriptStates) {
+		for (LuaStateWrapper& luaState : m_ScriptStates) {
 			luaState.ClearUserModuleCache();
 		}
-		m_ScriptThreadSafetyMap.clear();
     }
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -439,16 +449,6 @@ namespace RTE {
 		return timings;
 	}
 
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-	void LuaMan::ClearLuaScriptCache() {
-		m_ScriptThreadSafetyMap.clear();
-		m_MasterScriptState.ClearLuaScriptCache();
-		for (LuaStateWrapper &luaState : m_ScriptStates) {
-			luaState.ClearLuaScriptCache();
-		}
-	}
-
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	void LuaMan::Destroy() {

Managers/LuaMan.h

@@ -412,11 +412,6 @@ namespace RTE {
 		/// </summary>
 		/// <returns>m_ScriptTimings.</returns>
 		const std::unordered_map<std::string, PerformanceMan::ScriptTiming> GetScriptTimings() const;
-
-		/// <summary>
-		/// Clears the Lua script cache.
-		/// </summary>
-		void ClearLuaScriptCache();
 #pragma endregion
 
 #pragma region File I/O Handling

Managers/PresetMan.cpp

@@ -908,7 +908,6 @@ std::string PresetMan::GetEntityDataLocation(std::string type, std::string prese
 
 void PresetMan::ReloadAllScripts() const {
 	g_LuaMan.ClearUserModuleCache();
-	g_LuaMan.ClearLuaScriptCache();
 	for (const DataModule *dataModule : m_pDataModules) {
 		dataModule->ReloadAllScripts();
 	}