Merge branch 'master' of https://github.com/olive-editor/olive
This commit is contained in:
@@ -22,9 +22,9 @@ assignees: ''
|
|||||||
2.
|
2.
|
||||||
3.
|
3.
|
||||||
|
|
||||||
<details><summary><strong>Backtrace</strong></summary><pre><code>
|
<details><summary><strong>Crash Report</strong></summary><pre><code>
|
||||||
|
|
||||||
<!-- Paste backtrace here -->
|
<!-- You should have received a crash report from Olive to paste here. -->
|
||||||
|
|
||||||
</code></pre></details>
|
</code></pre></details>
|
||||||
|
|
||||||
|
|||||||
@@ -807,6 +807,12 @@ void TimelineWidget::ViewMouseReleased(TimelineViewMouseEvent *event)
|
|||||||
|
|
||||||
void TimelineWidget::ViewMouseDoubleClicked(TimelineViewMouseEvent *event)
|
void TimelineWidget::ViewMouseDoubleClicked(TimelineViewMouseEvent *event)
|
||||||
{
|
{
|
||||||
|
// kHand tool will return nullptr
|
||||||
|
if (!GetActiveTool()) {
|
||||||
|
// Only kHand should return a nullptr
|
||||||
|
Q_ASSERT(Core::instance()->tool() == olive::Tool::kHand);
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (GetConnectedNode()) {
|
if (GetConnectedNode()) {
|
||||||
GetActiveTool()->MouseDoubleClick(event);
|
GetActiveTool()->MouseDoubleClick(event);
|
||||||
UpdateViewports();
|
UpdateViewports();
|
||||||
|
|||||||
@@ -322,7 +322,8 @@ void ViewerWidget::SetFullScreen(QScreen *screen)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (windows_.contains(screen)) {
|
if (windows_.contains(screen)) {
|
||||||
delete windows_.take(screen);
|
ViewerWindow* vw = windows_.take(screen);
|
||||||
|
vw->deleteLater();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user