From 7411302334157ab3a34b39722f297dfa39d43404 Mon Sep 17 00:00:00 2001 From: Emma Broman Date: Tue, 8 Aug 2023 13:41:20 +0200 Subject: [PATCH] Fix fatal error when starting profile with navigation state camera setting And provide more information in the fatal error message... (emerged from commit 30b80843c34273ef9f30eb785e496f2eb259e4d8) --- src/engine/openspaceengine.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp index 10d9b57e69..894790e077 100644 --- a/src/engine/openspaceengine.cpp +++ b/src/engine/openspaceengine.cpp @@ -1720,7 +1720,9 @@ void setCameraFromProfile(const Profile& p) { auto checkNodeExists = [](const std::string& node) { if (global::renderEngine->scene()->sceneGraphNode(node) == nullptr) { - throw ghoul::RuntimeError(fmt::format("Could not find node '{}'", node)); + throw ghoul::RuntimeError(fmt::format( + "Error when setting camera from profile. Could not find node '{}'", node + )); } }; @@ -1730,7 +1732,7 @@ void setCameraFromProfile(const Profile& p) { interaction::NavigationState nav; nav.anchor = navStateProfile.anchor; checkNodeExists(nav.anchor); - if (navStateProfile.aim.has_value()) { + if (navStateProfile.aim.has_value() && !(*navStateProfile.aim).empty()) { nav.aim = navStateProfile.aim.value(); checkNodeExists(nav.aim); }