From 7e35cf5823a9873a0467e09a5bc441319390e6eb Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Thu, 15 Sep 2016 18:02:13 +0200 Subject: [PATCH] Make InteractionHandler not crash if the Camera focus node is not found --- src/interaction/interactionhandler.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/interaction/interactionhandler.cpp b/src/interaction/interactionhandler.cpp index 8f8d389c09..0c8d324daf 100644 --- a/src/interaction/interactionhandler.cpp +++ b/src/interaction/interactionhandler.cpp @@ -794,8 +794,10 @@ void InteractionHandler::postSynchronizationPreDraw() { _cameraUpdatedFromScript = false; } else { - _currentInteractionMode->updateCameraStateFromMouseStates(*_camera); - _camera->setFocusPositionVec3(focusNode()->worldPosition()); + if (_camera && focusNode()) { + _currentInteractionMode->updateCameraStateFromMouseStates(*_camera); + _camera->setFocusPositionVec3(focusNode()->worldPosition()); + } } }