fly/flightgear
1
0
Fork 0
Code Activity

View tweaks to try to understand crash with no camera group

Browse source 
Sentry-Id: FLIGHTGEAR-H9F
This commit is contained in:
James Turner 2021-03-23 17:08:34 +00:00
parent 344058baba
commit 1ee8b9e568
2 changed files with 6 additions and 0 deletions

1
src/Viewer/fg_os_osgviewer.cxx
View file

@ -438,6 +438,7 @@ void fgOSCloseWindow()
} }
} }
FGScenery::resetPagerSingleton(); FGScenery::resetPagerSingleton();
flightgear::addSentryBreadcrumb("fgOSCloseWindow, clearing camera group", "info");
flightgear::CameraGroup::setDefault(NULL); flightgear::CameraGroup::setDefault(NULL);
WindowSystemAdapter::setWSA(NULL); WindowSystemAdapter::setWSA(NULL);
viewer = NULL; viewer = NULL;

5
src/Viewer/viewmgr.cxx
View file

@ -177,6 +177,11 @@ FGViewMgr::update (double dt)
// update the camera now // update the camera now
osg::ref_ptr<flightgear::CameraGroup> cameraGroup = flightgear::CameraGroup::getDefault(); osg::ref_ptr<flightgear::CameraGroup> cameraGroup = flightgear::CameraGroup::getDefault();
if (!cameraGroup) {
// attempting to diagnose the cause of FLIGHTGEAR-H9F
throw sg_exception("FGViewMgr::update: no camera group exists");
}
if (cameraGroup) { if (cameraGroup) {
cameraGroup->setCameraParameters(currentView->get_v_fov(), cameraGroup->setCameraParameters(currentView->get_v_fov(),
cameraGroup->getMasterAspectRatio()); cameraGroup->getMasterAspectRatio());