[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive/Applications/16.12] src/timeline: Fix undo grouping broken
From:       Albert Astals Cid <aacid () kde ! org>
Date:       2016-11-15 22:54:45
Message-ID: E1c6mcn-000890-RH () code ! kde ! org
[Download RAW message or body]

Git commit d25e1db8b7c7db083482bd2fb545ac7cfe571b2b by Albert Astals Cid, on behalf \
of Jean-Baptiste Mardelle. Committed on 15/11/2016 at 22:54.
Pushed by aacid into branch 'Applications/16.12'.

Fix undo grouping broken
CCBUG: 370653

M  +3    -3    src/timeline/customtrackview.cpp

http://commits.kde.org/kdenlive/d25e1db8b7c7db083482bd2fb545ac7cfe571b2b

diff --git a/src/timeline/customtrackview.cpp b/src/timeline/customtrackview.cpp
index 0e9bdc6..0d112fc 100644
--- a/src/timeline/customtrackview.cpp
+++ b/src/timeline/customtrackview.cpp
@@ -4405,7 +4405,7 @@ void CustomTrackView::groupClips(bool group, \
QList<QGraphicsItem *> itemList, bo  // Expand groups
     int max = itemList.count();
     for (int i = 0; i < max; ++i) {
-        if (itemList.at(i)->type() == GroupWidget) {
+        if (itemList.at(i)->type() == GroupWidget && itemList.at(i) != \
m_selectionGroup) {  if (!existingGroups.contains(itemList.at(i))) {
                 existingGroups << itemList.at(i);
             }
@@ -4513,14 +4513,14 @@ void CustomTrackView::doGroupClips(QList <ItemInfo> \
clipInfos, QList <ItemInfo>  QList <QGraphicsItem *>list;
     for (int i = 0; i < clipInfos.count(); ++i) {
         ClipItem *clip = getClipItemAtStart(clipInfos.at(i).startPos, \
                clipInfos.at(i).track);
-        if (clip) {
+        if (clip && !list.contains(clip)) {
             list.append(clip);
             //clip->setSelected(true);
         }
     }
     for (int i = 0; i < transitionInfos.count(); ++i) {
         Transition *clip = getTransitionItemAt(transitionInfos.at(i).startPos, \
                transitionInfos.at(i).track);
-        if (clip) {
+        if (clip && !list.contains(clip)) {
             list.append(clip);
             //clip->setSelected(true);
         }


[prev in list] [next in list] [prev in thread] [next in thread]