Reset: do general init on reset path

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index d65092bfe5ce780edfa1cc2ea4abc8c7fc0c53e0..15397c41faabfb87b16d7ae8c2e8d08892e96a14 100644 (file)
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -984,6 +984,9 @@ void fgStartNewReset()
     globals->resetPropertyRoot();
     globals->restoreInitialState();
     
+    fgInitConfig(0, NULL, true);
+    fgInitGeneral(); // all of this?
+    
     render = new FGRenderer;
     render->setEventHandler(eventHandler);
     globals->set_renderer(render);
@@ -995,7 +998,6 @@ void fgStartNewReset()
     flightgear::CameraGroup::buildDefaultGroup(viewer.get());
 
     fgOSResetProperties();
-    fgInitConfig(0, NULL, true);
     
 // init some things manually
 // which do not follow the regular init pattern

diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index ee639d64a406922582de670ae80916e806df606d..2fda3045bada940993b8c0d3146202eb393aaf49 100644 (file)
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -520,10 +520,9 @@ FGGlobals::resetPropertyRoot()
 {
     delete locale;
     
-#if DEBUG_RESET
     SG_LOG(SG_GENERAL, SG_INFO, "root props refcount:" << props.getNumRefs());
     treeDumpRefCounts(0, props);
-#endif
+
     props = new SGPropertyNode;
     initProperties();
     locale = new FGLocale(props);