Reset: remove commands

diff --git a/src/AIModel/AIManager.cxx b/src/AIModel/AIManager.cxx
index b7ec95a8472b89555c3957be3775dbd21fe0e57d..c0d8a78a7fe24ce757f34ae9ac3427a21bbf83a1 100644 (file)
--- a/src/AIModel/AIManager.cxx
+++ b/src/AIModel/AIManager.cxx
@@ -181,6 +181,9 @@ FGAIManager::shutdown()
     }
     
     ai_list.clear();
+    
+    globals->get_commands()->removeCommand("load-scenario");
+    globals->get_commands()->removeCommand("unload-scenario");
 }
 
 void

diff --git a/src/Autopilot/route_mgr.cxx b/src/Autopilot/route_mgr.cxx
index fd46f4be7ee875853adeac28d8824d323d32ccb4..72f3cccfebc2c531332aad99d6c828a9589c4c5d 100644 (file)
--- a/src/Autopilot/route_mgr.cxx
+++ b/src/Autopilot/route_mgr.cxx
@@ -238,9 +238,16 @@ FGRouteMgr::~FGRouteMgr()
                _plan->removeDelegate(this);
        }
 
-  //SGCommandMgr* cmdMgr = SGCommandMgr::instance();
-  //cmdMgr->removeCommand("define-user-waypoint");
-    
+    SGCommandMgr* cmdMgr = SGCommandMgr::instance();
+    cmdMgr->removeCommand("define-user-waypoint");
+    cmdMgr->removeCommand("delete-user-waypoint");
+    cmdMgr->removeCommand("load-flightplan");
+    cmdMgr->removeCommand("save-flightplan");
+    cmdMgr->removeCommand("activate-flightplan");
+    cmdMgr->removeCommand("clear-flightplan");
+    cmdMgr->removeCommand("set-active-waypt");
+    cmdMgr->removeCommand("insert-waypt");
+    cmdMgr->removeCommand("delete-waypt");
 }
 
 

diff --git a/src/Environment/fgclouds.cxx b/src/Environment/fgclouds.cxx
index 6e77d9b0e96629a49d51ff8df56e20080447f3e2..58653e05364c3dce780ab2695d3f308743ff8406 100644 (file)
--- a/src/Environment/fgclouds.cxx
+++ b/src/Environment/fgclouds.cxx
@@ -57,6 +57,10 @@ FGClouds::FGClouds() :
 
 FGClouds::~FGClouds()
 {
+    globals->get_commands()->removeCommand("add-cloud");
+       globals->get_commands()->removeCommand("del-cloud");
+       globals->get_commands()->removeCommand("move-cloud");
+
 }
 
 int FGClouds::get_update_event(void) const {

diff --git a/src/Environment/realwx_ctrl.cxx b/src/Environment/realwx_ctrl.cxx
index 8378159098356c8e7fb62ab522d2529d42b11b1a..b45e0cbcfb7fc17e0d7e3fe474f51044a30c15ef 100644 (file)
--- a/src/Environment/realwx_ctrl.cxx
+++ b/src/Environment/realwx_ctrl.cxx
@@ -232,30 +232,32 @@ BasicRealWxController::BasicRealWxController( SGPropertyNode_ptr rootNode, Metar
   _wasEnabled(false),
   _requester(metarRequester)
 {
-    // at least instantiate MetarProperties for /environment/metar
-    _metarProperties.push_back( new LiveMetarProperties( 
-            fgGetNode( rootNode->getStringValue("metar", "/environment/metar"), true ),
-            metarRequester,
-            getMetarMaxAgeMin()));
-
-    BOOST_FOREACH( SGPropertyNode_ptr n, rootNode->getChildren("metar") ) {
-        SGPropertyNode_ptr metarNode = fgGetNode( n->getStringValue(), true );
-        addMetarAtPath(metarNode->getPath(), "");
-    }
-  
+    
     SGCommandMgr::instance()->addCommand("request-metar", commandRequestMetar);
     SGCommandMgr::instance()->addCommand("clear-metar", commandClearMetar);
 }
 
 BasicRealWxController::~BasicRealWxController()
 {
-  //SGCommandMgr::instance()->removeCommand("request-metar");
+    SGCommandMgr::instance()->removeCommand("request-metar");
+    SGCommandMgr::instance()->removeCommand("clear-metar");
 }
 
 void BasicRealWxController::init()
 {
     _wasEnabled = false;
     
+    // at least instantiate MetarProperties for /environment/metar
+    SGPropertyNode_ptr metarNode = fgGetNode( _rootNode->getStringValue("metar", "/environment/metar"), true );
+    _metarProperties.push_back( new LiveMetarProperties(metarNode,
+                                                        _requester,
+                                                        getMetarMaxAgeMin()));
+    
+    BOOST_FOREACH( SGPropertyNode_ptr n, _rootNode->getChildren("metar") ) {
+        SGPropertyNode_ptr metarNode = fgGetNode( n->getStringValue(), true );
+        addMetarAtPath(metarNode->getPath(), "");
+    }
+
     checkNearbyMetar();
     update(0); // fetch data ASAP