oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

timeline: split gaps only if there's an insert

Browse Source 
Fixes regression from 97afae9687
This commit is contained in:
itsmattkc
2020-11-29 17:06:56 +11:00
parent 6a6fa8674a
commit 9ee523b145
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/timelinewidget/undo/undo.cpp
+2 -2
View File
@@ -210,7 +210,7 @@ void TrackRippleRemoveAreaCommand::redo_internal()
// If we picked up a block to splice
if (splice_) {
if (trim_out_->type() == Block::kGap) {
if (trim_out_->type() == Block::kGap && !insert_) {
// Gaps shouldn't be split, just trim the difference
trim_out_->set_length_and_media_out(trim_out_->length() - (out_ - in_));
@@ -310,7 +310,7 @@ void TrackRippleRemoveAreaCommand::undo_internal()
if (splice_) {
if (trim_out_->type() == Block::kGap) {
if (trim_out_->type() == Block::kGap && !insert_) {
// Just restore the length
trim_out_->set_length_and_media_out(trim_out_->length() + (out_ - in_));