- moved main to mainLoop, and added top-level main to catch any missed

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

diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index 312dc0b81080983ff34e846d8683e8c397f31880..9de7fdb4382d6f8c8b878aa3d1032273eddc3e67 100644 (file)
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -39,8 +39,9 @@ FGGlobals::FGGlobals() :
     freeze( false ),
     warp( 0 ),
     warp_delta( 0 ),
-    props(0),
-    initial_state(0)
+    props(new SGPropertyNode),
+    initial_state(0),
+    commands(new SGCommandMgr)
 {
 }
 
@@ -49,6 +50,8 @@ FGGlobals::FGGlobals() :
 FGGlobals::~FGGlobals() 
 {
   delete initial_state;
+  delete props;
+  delete commands;
 }
 
 
@@ -59,7 +62,7 @@ FGGlobals::saveInitialState ()
   delete initial_state;
   initial_state = new SGPropertyNode();
   if (!copyProperties(props, initial_state))
-    FG_LOG(FG_GENERAL, FG_ALERT, "Error saving initial state");
+    SG_LOG(SG_GENERAL, SG_ALERT, "Error saving initial state");
 }
 
 
@@ -68,12 +71,12 @@ void
 FGGlobals::restoreInitialState ()
 {
   if (initial_state == 0) {
-    FG_LOG(FG_GENERAL, FG_ALERT, "No initial state available to restore!!!");
+    SG_LOG(SG_GENERAL, SG_ALERT, "No initial state available to restore!!!");
   } else if (!copyProperties(initial_state, props)) {
-    FG_LOG(FG_GENERAL, FG_INFO,
+    SG_LOG(SG_GENERAL, SG_INFO,
           "Some errors restoring initial state (probably just read-only props)");
   } else {
-    FG_LOG(FG_GENERAL, FG_INFO, "Initial state restored successfully");
+    SG_LOG(SG_GENERAL, SG_INFO, "Initial state restored successfully");
   }
 }