X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedits.C;h=9cab7c2a48f877739313a165e165c7bfdc5ac9cd;hb=43821d27c5b51c4250a251f20c98878f54deb288;hp=7d152bc5ef0e59c50155e2a2a34bedbb78dd0863;hpb=21b49090a36821cfe97bdfc573c7fbacc80653d1;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/edits.C b/cinelerra-5.1/cinelerra/edits.C index 7d152bc5..9cab7c2a 100644 --- a/cinelerra-5.1/cinelerra/edits.C +++ b/cinelerra-5.1/cinelerra/edits.C @@ -408,7 +408,7 @@ int Edits::optimize() current = current->next; } - if(last && last->silence()) { + if(last && last->silence() && !last->transition ) { delete last; result = 1; } @@ -820,7 +820,7 @@ Edit *Edits::create_silence(int64_t start, int64_t end) } return new_edit; } - + Edit* Edits::shift(int64_t position, int64_t difference) { Edit *new_edit = split_edit(position);