From 2c60211d6ca22062d135f9c35b44932cad85d4e4 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Wed, 29 Jun 2016 13:19:34 +0300 Subject: Fix crash if user clicks on the editor before viewport is initialized MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Icaf14a0f553487fffe0e25b45ddc6f07c9e9d7f2 Reviewed-by: Tomi Korpipää --- editorlib/src/editorviewportitem.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/editorlib/src/editorviewportitem.cpp b/editorlib/src/editorviewportitem.cpp index b6582af..4b0fac6 100644 --- a/editorlib/src/editorviewportitem.cpp +++ b/editorlib/src/editorviewportitem.cpp @@ -279,7 +279,7 @@ void EditorViewportItem::geometryChanged(const QRectF &newGeometry, const QRectF void EditorViewportItem::mousePressEvent(QMouseEvent *event) { - if (m_inputEnabled) { + if (m_inputEnabled && m_cameraController) { m_cameraController->handleMousePress(event); event->accept(); } else { @@ -297,7 +297,7 @@ void EditorViewportItem::mouseMoveEvent(QMouseEvent *event) void EditorViewportItem::mouseReleaseEvent(QMouseEvent *event) { - if (m_inputEnabled) { + if (m_inputEnabled && m_cameraController) { m_cameraController->handleMouseRelease(event); event->accept(); } else { @@ -307,7 +307,7 @@ void EditorViewportItem::mouseReleaseEvent(QMouseEvent *event) void EditorViewportItem::wheelEvent(QWheelEvent *event) { - if (m_inputEnabled) + if (m_inputEnabled && m_cameraController) m_cameraController->handleWheel(event); else event->ignore(); -- cgit v1.2.3