From: Jean-Baptiste Mardelle <jb@kdenlive.org>
Date: Mon, 5 Oct 2009 07:37:33 +0000 (+0000)
Subject: Fix error in copy / paste transition
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=dcfa228c1f15d7cd0249d296234fe633e86450ed;p=kdenlive

Fix error in copy / paste transition

svn path=/trunk/kdenlive/; revision=3996
---

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 4906d82c..de0e567d 100644
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -3669,6 +3669,7 @@ void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end, b
         emit transitionItemSelected(item, getPreviousVideoTrack(item->track()), p);
     }
     if (m_refresh) m_document->renderer()->doRefresh();
+    setDocumentModified();
 }
 
 void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end, bool dontWorry)
@@ -3718,6 +3719,7 @@ void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end, bool
     }
     m_document->renderer()->doRefresh();
     KdenliveSettings::setSnaptopoints(snap);
+    setDocumentModified();
 }
 
 void CustomTrackView::updatePositionEffects(ClipItem * item, ItemInfo info)
@@ -4368,10 +4370,13 @@ void CustomTrackView::pasteClip()
             info.startPos = tr->startPos() + offset;
             info.endPos = tr->endPos() + offset;
             info.track = tr->track() + trackOffset;
+            int transitionEndTrack;
+            if (tr->isAutomatic()) transitionEndTrack = getPreviousVideoTrack(info.track);
+            else transitionEndTrack = tr->transitionEndTrack();
             if (canBePastedTo(info, TRANSITIONWIDGET)) {
                 if (info.startPos >= info.endPos) {
                     emit displayMessage(i18n("Invalid transition"), ErrorMessage);
-                } else new AddTransitionCommand(this, info, tr->transitionEndTrack() + trackOffset, tr->toXML(), false, true, pasteClips);
+                } else new AddTransitionCommand(this, info, transitionEndTrack, tr->toXML(), false, true, pasteClips);
             } else emit displayMessage(i18n("Cannot paste transition to selected place"), ErrorMessage);
         }
     }