summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2016-06-29 13:19:34 +0300
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2016-06-29 10:40:33 +0000
commit2c60211d6ca22062d135f9c35b44932cad85d4e4 (patch)
treeecd05f1d103f58682ca1e5e996d24da9a0fb66c2
parent27138f130158e6bdc57de803ecd96d95a6fc0f22 (diff)
Fix crash if user clicks on the editor before viewport is initialized
Change-Id: Icaf14a0f553487fffe0e25b45ddc6f07c9e9d7f2 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
-rw-r--r--editorlib/src/editorviewportitem.cpp6
1 files 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();