Commit a8599d6e authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Mix: Fix first clip out not correctly reset on second clip deletion

parent f305f37d
Pipeline #65027 canceled with stage
...@@ -1840,6 +1840,12 @@ bool TimelineModel::requestClipDeletion(int clipId, Fun &undo, Fun &redo) ...@@ -1840,6 +1840,12 @@ bool TimelineModel::requestClipDeletion(int clipId, Fun &undo, Fun &redo)
res = getTrackById(trackId)->requestRemoveMix({clipId, mixData.secondClipId}, undo, redo); res = getTrackById(trackId)->requestRemoveMix({clipId, mixData.secondClipId}, undo, redo);
} }
} }
if (getTrackById_const(trackId)->hasStartMix(clipId)) {
MixInfo mixData = getTrackById_const(trackId)->getMixInfo(clipId).first;
if (isClip(mixData.firstClipId)) {
res = getTrackById(trackId)->requestRemoveMix({mixData.firstClipId, clipId}, undo, redo);
}
}
res = res && getTrackById(trackId)->requestClipDeletion(clipId, true, !m_closing, undo, redo, false, true); res = res && getTrackById(trackId)->requestClipDeletion(clipId, true, !m_closing, undo, redo, false, true);
if (!res) { if (!res) {
undo(); undo();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment