Git commit d25e1db8b7c7db083482bd2fb545ac7cfe571b2b by Albert Astals Cid, o=
n 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/customtrackvie=
w.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<QG=
raphicsItem *> itemList, bo
     // Expand groups
     int max =3D itemList.count();
     for (int i =3D 0; i < max; ++i) {
-        if (itemList.at(i)->type() =3D=3D GroupWidget) {
+        if (itemList.at(i)->type() =3D=3D GroupWidget && itemList.at(i) !=
=3D 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 =3D 0; i < clipInfos.count(); ++i) {
         ClipItem *clip =3D getClipItemAtStart(clipInfos.at(i).startPos, cl=
ipInfos.at(i).track);
-        if (clip) {
+        if (clip && !list.contains(clip)) {
             list.append(clip);
             //clip->setSelected(true);
         }
     }
     for (int i =3D 0; i < transitionInfos.count(); ++i) {
         Transition *clip =3D getTransitionItemAt(transitionInfos.at(i).sta=
rtPos, transitionInfos.at(i).track);
-        if (clip) {
+        if (clip && !list.contains(clip)) {
             list.append(clip);
             //clip->setSelected(true);
         }