diff options
| author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2019-02-19 08:48:59 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@qt.io> | 2019-02-19 11:04:18 +0000 |
| commit | f4644d1880260d362502ec0801708ea2fe66499a (patch) | |
| tree | ad405bd8bb29ac6a02a8ae522c57bd4c2456b582 | |
| parent | 1fa0d29b1b6f11b58b0cbf2b5fc64d59235f098c (diff) | |
Fix crash when editing playhead time
Task-number: QT3DS-3076
Change-Id: I167ce00748e2fa62c0145a7db4373cb00358cdfe
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| -rw-r--r-- | src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineGraphicsScene.cpp | 3 | ||||
| -rw-r--r-- | src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineWidget.cpp | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineGraphicsScene.cpp b/src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineGraphicsScene.cpp index 850971c4..6fab4e3e 100644 --- a/src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineGraphicsScene.cpp +++ b/src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineGraphicsScene.cpp @@ -851,7 +851,8 @@ void TimelineGraphicsScene::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *even || itemBelowPlayhead->type() == TimelineItem::TypeRuler) { CDoc *doc = g_StudioApp.GetCore()->GetDoc(); g_StudioApp.GetDialogs()->asyncDisplayTimeEditDialog(doc->GetCurrentViewTime(), - doc, PLAYHEAD); + doc, PLAYHEAD, + m_keyframeManager); } else { item = itemBelowPlayhead; if (item->type() == TimelineItem::TypeRowTree) { diff --git a/src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineWidget.cpp b/src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineWidget.cpp index c745ff6c..ee7d4bee 100644 --- a/src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineWidget.cpp +++ b/src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineWidget.cpp @@ -247,10 +247,11 @@ TimelineWidget::TimelineWidget(const QSize &preferredSize, QWidget *parent) connect(m_toolbar, &TimelineToolbar::deleteLayerTriggered, [=](){ doc->DeleteSelectedObject(); }); - connect(m_toolbar, &TimelineToolbar::gotoTimeTriggered, this, []() { + connect(m_toolbar, &TimelineToolbar::gotoTimeTriggered, this, [=]() { CDoc *doc = g_StudioApp.GetCore()->GetDoc(); g_StudioApp.GetDialogs()->asyncDisplayTimeEditDialog(doc->GetCurrentViewTime(), - doc, PLAYHEAD); + doc, PLAYHEAD, + m_graphicsScene->keyframeManager()); }); connect(m_toolbar, &TimelineToolbar::firstFrameTriggered, this, []() { |