From: Jean-Baptiste Mardelle Date: Fri, 5 Oct 2012 13:27:07 +0000 (+0200) Subject: When inserting a zone from clip monitor (Shift+Ctrl+I) and the cursor is inside a... X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=e8adc4246addd903541d9b269fe87f0993dac635;p=kdenlive When inserting a zone from clip monitor (Shift+Ctrl+I) and the cursor is inside a clip, append the zone to the end of the track instead of triggering error --- diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 2d55c1d8..93b4ef32 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -1489,7 +1489,15 @@ void CustomTrackView::insertClipCut(DocClipBase *clip, int in, int out) pasteInfo.startPos = GenTime(m_cursorPos, m_document->fps()); pasteInfo.endPos = pasteInfo.startPos + info.endPos; pasteInfo.track = selectedTrack(); - if (!canBePastedTo(pasteInfo, AVWIDGET)) { + bool ok = canBePastedTo(pasteInfo, AVWIDGET); + if (!ok) { + // Cannot be inserted at cursor pos, insert at end of track + int duration = m_document->renderer()->mltTrackDuration(m_document->tracksCount() - pasteInfo.track) + 1; + pasteInfo.startPos = GenTime(duration, m_document->fps()); + pasteInfo.endPos = pasteInfo.startPos + info.endPos; + ok = canBePastedTo(pasteInfo, AVWIDGET); + } + if (!ok) { emit displayMessage(i18n("Cannot insert clip in timeline"), ErrorMessage); return; }