Skip to content

Commit f947017

Browse files
committed
Fix bug when undoing a MOVE operation
1 parent 79e396b commit f947017

2 files changed

Lines changed: 12 additions & 4 deletions

File tree

Source/Processors/ProcessorGraph/ProcessorGraph.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,17 @@ void ProcessorGraph::moveProcessor(GenericProcessor* processor,
160160
checkForNewRootNodes(processor, false, true);
161161

162162
if (moveDownstream) // processor is further down the signal chain, its original dest may have changed
163+
{
164+
LOGD("MOVE: Updating settings for ", originalDest->getNodeId());
163165
updateSettings(originalDest);
166+
}
167+
164168
else // processor is upstream of its original dest, so we can just update that
169+
{
170+
LOGD("MOVE: Updating settings for ", processor->getNodeId());
165171
updateSettings(processor);
172+
}
173+
166174
}
167175

168176
GenericProcessor* ProcessorGraph::createProcessor(Plugin::Description& description,

Source/UI/EditorViewportActions.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ MoveProcessor::~MoveProcessor()
291291

292292
bool MoveProcessor::perform()
293293
{
294-
LOGDD("Peforming MOVE for processor ", nodeId);
294+
LOGD("Peforming MOVE for processor ", nodeId);
295295

296296
GenericProcessor* processor = AccessClass::getProcessorGraph()->getProcessorWithNodeId(nodeId);
297297

@@ -310,7 +310,7 @@ bool MoveProcessor::perform()
310310
bool MoveProcessor::undo()
311311
{
312312

313-
LOGDD("Undoing MOVE for processor ", nodeId);
313+
LOGD("Undoing MOVE for processor ", nodeId);
314314

315315
GenericProcessor* processor = AccessClass::getProcessorGraph()->getProcessorWithNodeId(nodeId);
316316

@@ -321,7 +321,7 @@ bool MoveProcessor::undo()
321321
AccessClass::getProcessorGraph()->moveProcessor(processor,
322322
sourceProcessor,
323323
destProcessor,
324-
moveDownstream);
324+
!moveDownstream);
325325

326326
if (processor->isSource() && originalDestNodeDestNodeId > -1)
327327
{
@@ -330,7 +330,7 @@ bool MoveProcessor::undo()
330330
AccessClass::getProcessorGraph()->moveProcessor(originalDest,
331331
destProcessor,
332332
originalDest->getDestNode(),
333-
moveDownstream);
333+
!moveDownstream);
334334
}
335335

336336
return true;

0 commit comments

Comments
 (0)