Improve timing statistics

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

diff --git a/src/Main/fg_os_osgviewer.cxx b/src/Main/fg_os_osgviewer.cxx
index 726c868a9ab7e721470ed1045e42676e77ca927e..e2556f5b2ea12e5c2e274c4b0cfe043c7202a33e 100644 (file)
--- a/src/Main/fg_os_osgviewer.cxx
+++ b/src/Main/fg_os_osgviewer.cxx
@@ -46,7 +46,6 @@
 #include <osgViewer/ViewerEventHandlers>
 #include <osgViewer/Viewer>
 
-#include <Include/general.hxx>
 #include <Scenery/scenery.hxx>
 #include "fg_os.hxx"
 #include "fg_props.hxx"
@@ -103,7 +102,7 @@ static osg::ref_ptr<osg::Camera> mainCamera;
 
 static void setStereoMode( const char * mode )
 {
-    DisplaySettings::StereoMode stereoMode;
+    DisplaySettings::StereoMode stereoMode = DisplaySettings::QUAD_BUFFER;
     bool stereoOn = true;
 
     if (strcmp(mode,"QUAD_BUFFER")==0)
@@ -293,6 +292,10 @@ int fgOSMainLoop()
 
 int fgGetKeyModifiers()
 {
+    if (!globals->get_renderer()) { // happens during shutdown
+      return 0;
+    }
+    
     return globals->get_renderer()->getEventHandler()->getCurrentModifiers();
 }