fix ConsequenceManager looped stagger launch crash

benkuper · Jan 2, 2025 · ec38d0a · ec38d0a
1 parent 722b8cb
commit ec38d0a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/Source/ChataigneEngine.cpp b/Source/ChataigneEngine.cpp
@@ -84,6 +84,7 @@ ChataigneEngine::~ChataigneEngine()
 	MouseHooker::deleteInstance();
 #endif
 
+	ConsequenceStaggerLauncher::deleteInstance();
 
 	ZeroconfManager::deleteInstance();
 	CommunityModuleManager::deleteInstance();
@@ -104,7 +105,6 @@ ChataigneEngine::~ChataigneEngine()
 	InputSystemManager::deleteInstance();
 	StreamDeckManager::deleteInstance();
 
-	ConsequenceStaggerLauncher::deleteInstance();
 
 	ChataigneAssetManager::deleteInstance();
 

diff --git a/Source/Common/Processor/Action/Consequence/ConsequenceManager.cpp b/Source/Common/Processor/Action/Consequence/ConsequenceManager.cpp
@@ -182,23 +182,28 @@ ConsequenceStaggerLauncher::~ConsequenceStaggerLauncher()
 
 void ConsequenceStaggerLauncher::run()
 {
-	Array<Launch*> toRemove;
+	toRemove.clear();
 
 	while (!threadShouldExit())
 	{
+
 		{
 			GenericScopedLock lock(launches.getLock());
 			for (auto& l : launches)
 			{
 				processLaunch(l);
 				if (l->isFinished()) toRemove.add(l);
 			}
+		}
 
+		{
+			GenericScopedLock lock(toRemove.getLock());
 			for (auto& l : toRemove) launches.removeObject(l);
-
-			if (launches.isEmpty()) break;
+			toRemove.clear();
 		}
 
+		if (launches.isEmpty()) break;
+
 		wait(10);
 	}
 
@@ -254,14 +259,11 @@ void ConsequenceStaggerLauncher::addLaunch(ConsequenceManager* csm, int multiple
 
 void ConsequenceStaggerLauncher::removeLaunchesFor(ConsequenceManager* manager, int multiplexIndex)
 {
-	GenericScopedLock lock(launches.getLock());
-	Array<Launch*> toRemove;
+	GenericScopedLock lock(toRemove.getLock());
 	for (auto& l : launches)
 	{
 		if (l->manager == manager && (multiplexIndex == -1 || l->multiplexIndex == multiplexIndex)) toRemove.add(l);
 	}
-
-	for (auto& l : toRemove) launches.removeObject(l);
 }
 
 void ConsequenceManager::multiplexPreviewIndexChanged()

diff --git a/Source/Common/Processor/Action/Consequence/ConsequenceManager.h b/Source/Common/Processor/Action/Consequence/ConsequenceManager.h
@@ -18,22 +18,26 @@ class ConsequenceStaggerLauncher :
 public:
 	juce_DeclareSingleton(ConsequenceStaggerLauncher, false)
 
-		ConsequenceStaggerLauncher();
+	ConsequenceStaggerLauncher();
 	~ConsequenceStaggerLauncher();
 
+
 	struct Launch
 	{
 		Launch(ConsequenceManager* c, int multiplexIndex) : manager(c), startTime(Time::getMillisecondCounter()), multiplexIndex(multiplexIndex), triggerIndex(0) {}
 
+
 		ConsequenceManager* manager;
 		uint32 startTime;
 		int multiplexIndex;
 		int triggerIndex;
+		Launch* currentProcessingLaunch;
 
 		bool isFinished();
 	};
 
 	OwnedArray<Launch, juce::CriticalSection> launches;
+	Array<Launch*, juce::CriticalSection> toRemove;
 
 	void run() override;
 	void processLaunch(Launch* l);