VoiceSynthesizer: add some test/debug properties

[flightgear.git] / src / Viewer / fgviewer.cxx

diff --git a/src/Viewer/fgviewer.cxx b/src/Viewer/fgviewer.cxx
index 0e98613dd6033d1aa06f8632265fdba24d80bb6b..be10d7a640adaa32ba58e9d704f40b8246b9cc0f 100644 (file)
--- a/src/Viewer/fgviewer.cxx
+++ b/src/Viewer/fgviewer.cxx
@@ -171,7 +171,7 @@ fgviewerMain(int argc, char** argv)
 
     globals = new FGGlobals;
 
-    int configResult = fgInitConfig(arguments.argc(), arguments.argv());
+    int configResult = fgInitConfig(arguments.argc(), arguments.argv(), false);
     if (configResult == flightgear::FG_OPTIONS_ERROR) {
         return EXIT_FAILURE;
     } else if (configResult == flightgear::FG_OPTIONS_EXIT) {
@@ -226,5 +226,11 @@ fgviewerMain(int argc, char** argv)
     // pass the loaded scene graph to the viewer.
     viewer.setSceneData(loadedModel.get());
 
-    return viewer.run();
+    int result = viewer.run();
+    
+    // clear cache now, since it contains SimGear objects. Otherwise SG_LOG
+    // calls during shutdown will cause crashes.
+    osgDB::Registry::instance()->clearObjectCache();
+    
+    return result;
 }