Merge branch 'next' of git://gitorious.org/fg/flightgear into next

[flightgear.git] / src / FDM / fdm_shell.cxx

diff --git a/src/FDM/fdm_shell.cxx b/src/FDM/fdm_shell.cxx
index 0d52e5aa33f81cf4362ecbcab4e57ea03d0a7176..a4cfad3098969198a5d60a3e765b8ae4ae27cbd8 100644 (file)
--- a/src/FDM/fdm_shell.cxx
+++ b/src/FDM/fdm_shell.cxx
@@ -68,13 +68,14 @@ FDMShell::~FDMShell()
 void FDMShell::init()
 {
   _props = globals->get_props();
+  fgSetBool("/sim/fdm-initialized", false);
   createImplementation();
 }
 
 void FDMShell::reinit()
 {
   if (_impl) {
-    fgSetBool("/sim/signals/fdm-initialized", false);
+    fgSetBool("/sim/fdm-initialized", false);
     evil_global_fdm_state = NULL;
     _impl->unbind();
     delete _impl;
@@ -97,7 +98,7 @@ void FDMShell::bind()
 
 void FDMShell::unbind()
 {
-  _impl->unbind();
+  if( _impl ) _impl->unbind();
 }
 
 void FDMShell::update(double dt)
@@ -122,6 +123,7 @@ void FDMShell::update(double dt)
         _impl->bind();
         
         evil_global_fdm_state = _impl;
+        fgSetBool("/sim/fdm-initialized", true);
         fgSetBool("/sim/signals/fdm-initialized", true);
     }
   }