fix crashes and isClearing

benkuper · Dec 11, 2024 · 21e8c71 · 21e8c71
1 parent be50fe8
commit 21e8c71
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Modules/juce_organicui b/Modules/juce_organicui
diff --git a/Modules/juce_timeline b/Modules/juce_timeline
diff --git a/Source/Common/Processor/Mapping/Input/MappingInput.cpp b/Source/Common/Processor/Mapping/Input/MappingInput.cpp
@@ -113,28 +113,28 @@ StandardMappingInput::StandardMappingInput(var params, Multiplex* processor) :
 
 StandardMappingInput::~StandardMappingInput()
 {
-	if (list != nullptr) list->removeMultiplexListListener(this);
+	if (list != nullptr && !list->isClearing) list->removeMultiplexListListener(this);
 }
 
 void StandardMappingInput::lockInput(Parameter* input)
 {
 	setInput(input);
-	if (input != nullptr) inputTarget->setEnabled(false);
+	if (input != nullptr && !list->isClearing) inputTarget->setEnabled(false);
 }
 
 
 void StandardMappingInput::setList(BaseMultiplexList* newList)
 {
 	if (newList == list) return;
 
-	if (list != nullptr)
+	if (list != nullptr && !list->isClearing)
 	{
 		list->removeMultiplexListListener(this);
 	}
 
 	list = newList;
 
-	if (list != nullptr)
+	if (list != nullptr && !list->isClearing)
 	{
 		list->addMultiplexListListener(this);
 	}
@@ -146,7 +146,7 @@ void StandardMappingInput::setList(BaseMultiplexList* newList)
 Parameter* StandardMappingInput::getInputAt(int multiplexIndex)
 {
 	if (!multiplexListMode) return MappingInput::getInputAt(multiplexIndex);
-	return dynamic_cast<Parameter*>(list != nullptr ? list->getTargetControllableAt(multiplexIndex) : nullptr);
+	return dynamic_cast<Parameter*>(list != nullptr && !list->isClearing ? list->getTargetControllableAt(multiplexIndex) : nullptr);
 }