summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Mardelle <jb@kdenlive.org>2016-11-15 22:51:32 (GMT)
committerAlbert Astals Cid <aacid@kde.org>2016-11-15 22:54:39 (GMT)
commitd25e1db8b7c7db083482bd2fb545ac7cfe571b2b (patch)
tree1083c80ca206f930a985dd9f214736193c821ef1
parentadcabe426afac090019ea8152f13ae2c9570683d (diff)
Fix undo grouping brokenv16.11.80
CCBUG: 370653
-rw-r--r--src/timeline/customtrackview.cpp6
1 files changed, 3 insertions, 3 deletions
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);
}