Prepare checking of removed / deleted files in a project:

[kdenlive] / src / customtrackview.cpp

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 6759a7aeaeaef13d394a9213ddb4e9ad7e4ea21c..5481cd81e1d399690eeea9f210bb85ff2d390647 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -4155,7 +4155,7 @@ void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end, b
     //item->moveTransition(GenTime((int) (endPos.x() - startPos.x()), m_document->fps()));
     KdenliveSettings::setSnaptopoints(snap);
     item->updateTransitionEndTrack(getPreviousVideoTrack(end.track));
-    m_document->renderer()->mltMoveTransition(item->transitionTag(), m_document->tracksCount() - start.track, m_document->tracksCount() - end.track, item->transitionEndTrack(), start.startPos, start.endPos, end.startPos, end.endPos);
+    m_document->renderer()->mltMoveTransition(item->transitionTag(), m_document->tracksCount() - start.track, m_document->tracksCount() - item->track(), item->transitionEndTrack(), start.startPos, start.endPos, item->startPos(), item->endPos());
     if (m_dragItem && m_dragItem == item) {
         QPoint p;
         ClipItem *transitionClip = getClipItemAt(item->startPos(), item->track());
@@ -5240,8 +5240,9 @@ void CustomTrackView::slotChangeTrack(int ix)
     d.track_nb->setValue(ix);
     d.slotUpdateName(ix);
     d.setWindowTitle(i18n("Change Track Type"));
-
-    if (m_document->trackInfoAt(m_document->tracksCount() - ix - 1).type == VIDEOTRACK)
+    
+    TrackInfo oldInfo = m_document->trackInfoAt(m_document->tracksCount() - ix - 1);
+    if (oldInfo.type == VIDEOTRACK)
         d.video_track->setChecked(true);
     else
         d.audio_track->setChecked(true);
@@ -5250,6 +5251,7 @@ void CustomTrackView::slotChangeTrack(int ix)
         TrackInfo info;
         info.isLocked = false;
         info.isMute = false;
+        info.trackName = oldInfo.trackName;
         ix = d.track_nb->value();
 
         if (d.video_track->isChecked()) {