Fix a crash when undoing AddProcessor

Happened when the processor being removed has a merger as the destination node
open-ephys · Oct 20, 2023 · 837a03a · 837a03a
1 parent 384944f
commit 837a03a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/Source/Processors/ProcessorGraph/ProcessorGraphActions.cpp b/Source/Processors/ProcessorGraph/ProcessorGraphActions.cpp
@@ -54,6 +54,8 @@ AddProcessor::AddProcessor(Plugin::Description description_,
         destNodeId = destProcessor->getNodeId();
     else
         destNodeId = -1;
+
+    mergerPath = -1;
 }
 
 AddProcessor::~AddProcessor()
@@ -90,6 +92,13 @@ bool AddProcessor::perform()
     if (processor != nullptr)
     {
         nodeId = processor->getNodeId();
+
+        if (destProcessor != nullptr && destProcessor->isMerger())
+        {
+            Merger* merger = (Merger*)destProcessor;
+            mergerPath = merger->getSourceNode(0)->getNodeId() == nodeId ? 0 : 1;
+        }
+
         return true;
     }
     else
@@ -98,7 +107,7 @@ bool AddProcessor::perform()
 
 bool AddProcessor::undo()
 {
-    LOGD("Undoing ADD for processor ", nodeId);
+    LOGDD("Undoing ADD for processor ", nodeId);
 
     Array<GenericProcessor*> processorToDelete;
 
@@ -108,6 +117,13 @@ bool AddProcessor::undo()
     if (settings != nullptr)
         delete settings;
 
+    GenericProcessor* destProcessor = processor->getDestNode();
+    if (mergerPath != -1 && destProcessor != nullptr && destProcessor->isMerger())
+    {
+        Merger* merger = (Merger*)destProcessor;
+        merger->switchIO(mergerPath);
+    }
+
     if (processor != nullptr)
     {
         settings = processorGraph->createNodeXml(processor, false);

diff --git a/Source/Processors/ProcessorGraph/ProcessorGraphActions.h b/Source/Processors/ProcessorGraph/ProcessorGraphActions.h
@@ -65,6 +65,8 @@ class AddProcessor : public UndoableAction
     bool signalChainIsLoading;
 
     int nodeId;
+
+    int mergerPath;
 
     Plugin::Description description;