mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-06 19:39:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Temporary fix for exception when adding exoplanet systems (#1781)

Browse Source 
The layer group might not yet be initialized when a layer is added, which leads to an exception when trying to find information about the layer group's layer manage and SGN for the event payload.
This commit is contained in:
Emma Broman
2021-11-05 14:42:34 +01:00
committed by GitHub
parent 55ee3d2785
commit baf67b8ed3
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/src/layergroup.cpp
+22 -7
View File
@@ -151,14 +151,29 @@ Layer* LayerGroup::addLayer(const ghoul::Dictionary& layerDict) {
properties::PropertyOwner* layerGroup = ptr->owner();
properties::PropertyOwner* layerManager = layerGroup->owner();
properties::PropertyOwner* globe = layerManager->owner();
properties::PropertyOwner* sceneGraphNode = globe->owner();
global::eventEngine->publishEvent<events::EventLayerAdded>(
sceneGraphNode->identifier(),
layerGroup->identifier(),
ptr->identifier()
);
// @TODO (emmbr, 2021-11-03) If the layer is added as part of the globe's
// dictionary during construction this function is called in the LayerManager's
// initialize function. This means that the layerManager does not exists yet, and
// we cannot find which SGN it belongs to... Want to avoid doing this check, so
// this should be fixed (probably as part of a cleanup/rewite of the LayerManager)
if (!layerManager) {
global::eventEngine->publishEvent<events::EventLayerAdded>(
"", // we don't know this yet
layerGroup->identifier(),
ptr->identifier()
);
}
else {
properties::PropertyOwner* globe = layerManager->owner();
properties::PropertyOwner* sceneGraphNode = globe->owner();
global::eventEngine->publishEvent<events::EventLayerAdded>(
sceneGraphNode->identifier(),
layerGroup->identifier(),
ptr->identifier()
);
}
return ptr;
}