]> git.sesse.net Git - kdenlive/commitdiff
Fix problem in transition move
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Sun, 28 Dec 2008 18:19:43 +0000 (18:19 +0000)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Sun, 28 Dec 2008 18:19:43 +0000 (18:19 +0000)
svn path=/branches/KDE4/; revision=2841

src/customtrackview.cpp

index c58d32b03e2100cefe486bf252c00c41cc7efcdb..85bf44d813429fda6efa6b381b26e03061c30ce1 100644 (file)
@@ -1793,7 +1793,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
                         }
                         new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand);
                     }
-                    if (tr == NULL || tr->endPos() < item->endPos()) {
+                    if (tr == NULL || tr->endPos() < m_dragItemInfo.endPos) {
                         // Check if there is a transition at clip end
                         tr = getTransitionItemAtEnd(m_dragItemInfo.endPos, m_dragItemInfo.track);
                         if (tr && tr->isAutomatic()) {
@@ -1821,7 +1821,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
                         }
                         new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand);
                     }
-                    if (m_dragItemInfo.track == info.track && (tr == NULL || tr->endPos() < item->endPos())) {
+                    if (m_dragItemInfo.track == info.track && (tr == NULL || tr->endPos() < m_dragItemInfo.endPos)) {
                         // Check if there is a transition at clip end
                         tr = getTransitionItemAtEnd(m_dragItemInfo.endPos, m_dragItemInfo.track - 1);
                         if (tr && tr->isAutomatic() && (m_document->tracksCount() - tr->transitionEndTrack()) == m_dragItemInfo.track) {