From 360e43aa67841203e891d1bfab68e2172561b03b Mon Sep 17 00:00:00 2001 From: Brian Matherly Date: Sun, 15 Oct 2023 23:45:15 -0500 Subject: [PATCH] Do not delete marker for next clip when ripple trim out As reported here: https://forum.shotcut.org/t/markers-gets-deleted/40683/6 --- src/commands/timelinecommands.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/commands/timelinecommands.cpp b/src/commands/timelinecommands.cpp index 63efe3fbd4..2ac3ad5a71 100644 --- a/src/commands/timelinecommands.cpp +++ b/src/commands/timelinecommands.cpp @@ -749,12 +749,12 @@ void TrimClipOutCommand::redo() for (int i = 0; i < newMarkers.size(); i++) { Markers::Marker &marker = newMarkers[i]; if (marker.start >= m_markerRemoveStart && - marker.start <= m_markerRemoveEnd) { + marker.start < m_markerRemoveEnd) { // This marker is in the removed segment. Remove it newMarkers.removeAt(i); i--; markersModified = true; - } else if (marker.start > m_markerRemoveEnd) { + } else if (marker.start >= m_markerRemoveEnd) { // This marker is after the removed segment. Shift it left marker.start -= m_markerRemoveEnd - m_markerRemoveStart; marker.end -= m_markerRemoveEnd - m_markerRemoveStart;