Fix possible timeline corruption caused by missing check for collision when aligning...

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index ab0a31232dedbaa2a7823143dfc3a00789f48ffe..433d70c08b481b547e6ef990a152632722bf0284 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -6086,6 +6086,12 @@ void CustomTrackView::alignAudio()
 #endif
                 }
 
+                if (itemCollision(clip, end)) {
+                    delete moveCommand;
+                    emit displayMessage(i18n("Unable to move clip due to collision."), ErrorMessage);
+                    return;
+                }
+
                 moveCommand->setText(i18n("Auto-align clip"));
                 new MoveClipCommand(this, start, end, true, moveCommand);
                 updateTrackDuration(clip->track(), moveCommand);