summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Mardelle <jb@kdenlive.org>2016-10-08 14:47:57 (GMT)
committerJean-Baptiste Mardelle <jb@kdenlive.org>2016-10-08 14:47:57 (GMT)
commit29cd72966fd5f916f67e19eea07ba853f49cc146 (patch)
tree80c0de7522649b104747803564eae14913e6fcd5
parent670d54393d1d504032848553b82f4122353f3c9f (diff)
Fix corrution when moving several clips (introduced in recent refactoring)
-rw-r--r--src/timeline/managers/selectmanager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/timeline/managers/selectmanager.cpp b/src/timeline/managers/selectmanager.cpp
index b85e7c0..f4bb3c7 100644
--- a/src/timeline/managers/selectmanager.cpp
+++ b/src/timeline/managers/selectmanager.cpp
@@ -119,8 +119,6 @@ bool SelectManager::mouseMove(QMouseEvent *event, int pos, int)
void SelectManager::mouseRelease(QMouseEvent *event, GenTime pos)
{
Q_UNUSED(pos);
- if (!m_dragMoved)
- return;
AbstractClipItem *dragItem = m_view->dragItem();
OperationType moveType = m_view->operationMode();
if (moveType == RubberSelection) {
@@ -129,7 +127,7 @@ void SelectManager::mouseRelease(QMouseEvent *event, GenTime pos)
if (dragItem) dragItem->setMainSelectedClip(false);
dragItem = NULL;
}
- //event->accept();
+ event->accept();
m_view->resetSelectionGroup();
m_view->groupSelectedItems();
if (m_view->selectionGroup() == NULL && dragItem) {
@@ -141,6 +139,8 @@ void SelectManager::mouseRelease(QMouseEvent *event, GenTime pos)
}
return;
}
+ if (!m_dragMoved)
+ return;
if (moveType == Seek || moveType == WaitingForConfirm || moveType == None || (!m_dragMoved && moveType == MoveOperation)) {
if (!(m_modifiers & Qt::ControlModifier)) {
if (dragItem) dragItem->setMainSelectedClip(false);