fly/flightgear
1
0
Fork 0
Code Activity

src/Viewer/renderer.cxx: disabled CompositeViewer assert that fired on shutdown after --help.

Browse source
This commit is contained in:
Julian Smith 2020-11-22 08:23:57 +00:00
parent 1cf5b2ab44
commit bd0452c793
1 changed files with 6 additions and 1 deletions

7
src/Viewer/renderer.cxx
View file

@ -1023,7 +1023,12 @@ osgViewer::ViewerBase* FGRenderer::getViewerBase()
osgViewer::View* FGRenderer::getView() osgViewer::View* FGRenderer::getView()
{ {
assert(composite_viewer_enabled != -1); /* Would like to assert that FGRenderer::init() has always been called
before we are called, with:
assert(composite_viewer_enabled != -1);
But this fails if user specifies -h, when we are called by
FGGlobals::~FGGlobals().
*/
if (composite_viewer) { if (composite_viewer) {
assert(composite_viewer->getNumViews()); assert(composite_viewer->getNumViews());
return composite_viewer->getView(0); return composite_viewer->getView(0);