From bd0452c7933e8c855eb2c79ea23e6821d66ce32b Mon Sep 17 00:00:00 2001
From: Julian Smith <jules@op59.net>
Date: Sun, 22 Nov 2020 08:23:57 +0000
Subject: [PATCH] src/Viewer/renderer.cxx: disabled CompositeViewer assert that
fired on shutdown after --help.
---
src/Viewer/renderer.cxx | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/Viewer/renderer.cxx b/src/Viewer/renderer.cxx
index a73cc2748..84b51c70a 100644
--- a/src/Viewer/renderer.cxx
+++ b/src/Viewer/renderer.cxx
@@ -1023,7 +1023,12 @@ osgViewer::ViewerBase* FGRenderer::getViewerBase()
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) {
assert(composite_viewer->getNumViews());
return composite_viewer->getView(0);