Fix for the fix: check for a viewer.

[flightgear.git] / src / Main / globals.cxx

diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index 9c714f6cb266c2548a989ea0f79b87f371eebf9e..fb3a35480c044c8d6e5cafa3d993526582a01126 100644 (file)
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -214,8 +214,10 @@ FGGlobals::~FGGlobals()
 
     // don't cancel the pager until after shutdown, since AIModels (and
     // potentially others) can queue delete requests on the pager.
-    renderer->getViewer()->getDatabasePager()->cancel();
-    renderer->getViewer()->getDatabasePager()->clear();
+    if (renderer->getViewer() && renderer->getViewer()->getDatabasePager()) {
+        renderer->getViewer()->getDatabasePager()->cancel();
+        renderer->getViewer()->getDatabasePager()->clear();
+    }
     osgDB::Registry::instance()->clearObjectCache();
     
     // renderer touches subsystems during its destruction