From 24ce8f84464c3d759f4daa2540ed7b4c11ab03df Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Thu, 27 May 2021 15:14:28 +1000 Subject: [PATCH] remove null context commands --- app/node/node.cpp | 10 ++-------- app/widget/timelinewidget/tool/import.cpp | 1 - 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/app/node/node.cpp b/app/node/node.cpp index 164104247..25702b157 100644 --- a/app/node/node.cpp +++ b/app/node/node.cpp @@ -2326,15 +2326,9 @@ void NodeSetPositionAsChildCommand::redo() sub_command_ = new MultiUndoCommand(); if (shift_surroundings_) { - if (relative_) { - sub_command_->add_child(new NodeSetPositionAndShiftSurroundingsCommand(node_, relative_, pos, true)); - } - sub_command_->add_child(new NodeSetPositionAndShiftSurroundingsCommand(node_, nullptr, pos, true)); + sub_command_->add_child(new NodeSetPositionAndShiftSurroundingsCommand(node_, relative_, pos, true)); } else { - if (relative_) { - sub_command_->add_child(new NodeSetPositionCommand(node_, relative_, pos, true)); - } - sub_command_->add_child(new NodeSetPositionCommand(node_, nullptr, pos, true)); + sub_command_->add_child(new NodeSetPositionCommand(node_, relative_, pos, true)); } } diff --git a/app/widget/timelinewidget/tool/import.cpp b/app/widget/timelinewidget/tool/import.cpp index 5f086fb74..7a6b762e7 100644 --- a/app/widget/timelinewidget/tool/import.cpp +++ b/app/widget/timelinewidget/tool/import.cpp @@ -387,7 +387,6 @@ void ImportTool::DropGhosts(bool insert) clip->set_length_and_media_out(ghost->GetLength()); clip->SetLabel(footage_stream.footage->GetLabel()); command->add_child(new NodeAddCommand(dst_graph, clip)); - command->add_child(new NodeSetPositionToOffsetOfAnotherNodeCommand(clip, footage_stream.footage, nullptr, QPointF(2, 0))); // Position clip in its own context command->add_child(new NodeSetPositionCommand(clip, clip, QPointF(0, 0), false));