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

List:       kde-commits
Subject:    [kdenlive] src/timeline: Fix crash on transition move
From:       Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date:       2016-06-14 20:02:11
Message-ID: E1bCuXL-0008KG-VF () scm ! kde ! org
[Download RAW message or body]

Git commit 49673eec7e62cc02312501c344e2105b6916c76c by Jean-Baptiste Mardelle.
Committed on 14/06/2016 at 20:01.
Pushed by mardelle into branch 'master'.

Fix crash on transition move
CCBUG: 364305

M  +11   -7    src/timeline/customtrackview.cpp
M  +1    -0    src/timeline/customtrackview.h
M  +1    -0    src/timeline/timeline.cpp

http://commits.kde.org/kdenlive/49673eec7e62cc02312501c344e2105b6916c76c

diff --git a/src/timeline/customtrackview.cpp b/src/timeline/customtrackview.cpp
index 3352081..b4d5df3 100644
--- a/src/timeline/customtrackview.cpp
+++ b/src/timeline/customtrackview.cpp
@@ -183,13 +183,6 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, Timeline \
                *timeline, CustomTra
     connect(m_disableClipAction, &QAction::triggered, this, \
&CustomTrackView::disableClip);  m_disableClipAction->setCheckable(true);
     m_document->doAddAction(QStringLiteral("clip_disabled"), m_disableClipAction, \
                QKeySequence());
-    m_toolManagers.insert(TrimType, new TrimManager(this, m_commandStack));
-    m_toolManagers.insert(SpacerType, new SpacerManager(this, m_commandStack));
-    m_toolManagers.insert(ResizeType, new ResizeManager(this, m_commandStack));
-    m_toolManagers.insert(RazorType, new RazorManager(this, m_commandStack));
-    m_toolManagers.insert(MoveType, new MoveManager(m_timeline->transitionHandler, \
                this, m_commandStack));
-    m_toolManagers.insert(SelectType, new SelectManager(this, m_commandStack));
-    m_toolManagers.insert(GuideType, new GuideManager(this, m_commandStack));
 }
 
 CustomTrackView::~CustomTrackView()
@@ -200,6 +193,17 @@ CustomTrackView::~CustomTrackView()
     delete m_keyPropertiesTimer;
 }
 
+void CustomTrackView::initTools()
+{
+    m_toolManagers.insert(TrimType, new TrimManager(this, m_commandStack));
+    m_toolManagers.insert(SpacerType, new SpacerManager(this, m_commandStack));
+    m_toolManagers.insert(ResizeType, new ResizeManager(this, m_commandStack));
+    m_toolManagers.insert(RazorType, new RazorManager(this, m_commandStack));
+    m_toolManagers.insert(MoveType, new MoveManager(m_timeline->transitionHandler, \
this, m_commandStack)); +    m_toolManagers.insert(SelectType, new \
SelectManager(this, m_commandStack)); +    m_toolManagers.insert(GuideType, new \
GuideManager(this, m_commandStack)); +}
+
 //virtual
 void CustomTrackView::keyPressEvent(QKeyEvent * event)
 {
diff --git a/src/timeline/customtrackview.h b/src/timeline/customtrackview.h
index e9aeefd..9847605 100644
--- a/src/timeline/customtrackview.h
+++ b/src/timeline/customtrackview.h
@@ -316,6 +316,7 @@ public:
     void reloadTrack(ItemInfo info);
     GenTime groupSelectedItems(QList <QGraphicsItem *> selection = QList \
<QGraphicsItem *>(), bool createNewGroup = false, bool selectNewGroup = false);  void \
sortGuides(); +    void initTools();
 
 public slots:
     /** @brief Send seek request to MLT. */
diff --git a/src/timeline/timeline.cpp b/src/timeline/timeline.cpp
index bffb27e..d6caffd 100644
--- a/src/timeline/timeline.cpp
+++ b/src/timeline/timeline.cpp
@@ -146,6 +146,7 @@ Timeline::Timeline(KdenliveDoc *doc, const QList<QAction *> \
                &actions, const QLis
     connect(m_trackview, SIGNAL(mousePosition(int)), this, \
SIGNAL(mousePosition(int)));  m_disablePreview = m_doc->getAction("disable_preview");
     connect(m_disablePreview, &QAction::triggered, this, &Timeline::disablePreview);
+    m_trackview->initTools();
 }
 
 Timeline::~Timeline()


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