ChaosMod: Wait until threads have stopped

Fixes OnStop not being run on lua scripts properly when reloading the game

Author: Regynate

ChaosMod/Components/EffectDispatcher.cpp

@@ -6,6 +6,7 @@
 #include "Components/EffectSound/EffectSoundManager.h"
 #include "Components/MetaModifiers.h"
 #include "Effects/EffectCategory.h"
+#include "Effects/EffectThreads.h"
 #include "Effects/EffectTimedType.h"
 #include "Effects/EnabledEffects.h"
 #include "Effects/Register/RegisteredEffectsMetadata.h"
@@ -284,7 +285,18 @@ void EffectDispatcher::UpdateEffects(float deltaTime)
 		m_PermanentEffects.clear();
 		SharedState.DispatchedEffectsLog.clear();
 
-		EffectThreads::StopThreadsImmediately();
+		static bool startedStopping = false;
+		
+		if (!startedStopping)
+		{
+			EffectThreads::StopThreadsImmediately();
+			startedStopping = true;
+		}
+
+		if (EffectThreads::GetThreadCount() > 0)
+			return;
+
+		startedStopping = false;
 
 		// Ensure player control isn't stuck in disabled state
 		SET_PLAYER_CONTROL(PLAYER_ID(), true, 0);

ChaosMod/Effects/EffectThreads.cpp

@@ -79,6 +79,11 @@ namespace EffectThreads
 			it = _StopThreadImmediately(it);
 	}
 
+	int GetThreadCount()
+	{
+		return m_Threads.size();
+	}
+
 	void PauseThisThread(DWORD timeMs)
 	{
 		auto fiber = GetCurrentFiber();

ChaosMod/Effects/EffectThreads.h

@@ -55,6 +55,8 @@ namespace EffectThreads
 	bool DoesThreadExist(LPVOID threadId);
 	bool HasThreadOnStartExecuted(LPVOID threadId);
 
+	int GetThreadCount();
+
 	bool IsThreadAnEffectThread();
 
 	EffectThreadSharedData *GetThreadSharedData(LPVOID threadId);

ChaosMod/Main.cpp

@@ -216,6 +216,17 @@ static void MainRun()
 
 	ms_Flags.ToggleModState = g_OptionsManager.GetConfigValue({ "DisableStartup" }, OPTION_DEFAULT_DISABLE_STARTUP);
 
+	if (ComponentExists<EffectDispatcher>())
+	{
+		const auto dispatcher = GetComponent<EffectDispatcher>();
+		dispatcher->ClearEffects();
+		while (dispatcher->IsClearingEffects())
+		{
+			dispatcher->OnRun();
+			WAIT(0);
+		}
+	}
+
 	for (auto &component : g_Components)
 		component->OnModPauseCleanup();