Modified Files:

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

diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index e914bce096ee9010b790f556c241eb7a518cabe0..33098d807ee09619d331933e3bc437f0ee78a381 100644 (file)
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -28,6 +28,8 @@
 #include <simgear/structure/commands.hxx>
 #include <simgear/misc/sg_path.hxx>
 
+#include <GUI/new_gui.hxx>
+
 #include "globals.hxx"
 #include "renderer.hxx"
 #include "viewmgr.hxx"
@@ -71,7 +73,7 @@ FGGlobals::FGGlobals() :
     props( new SGPropertyNode ),
     initial_state( NULL ),
     locale( NULL ),
-    commands( new SGCommandMgr ),
+    commands( SGCommandMgr::instance() ),
     model_lib( NULL ),
     acmodel( NULL ),
     model_mgr( NULL ),
@@ -80,6 +82,7 @@ FGGlobals::FGGlobals() :
     scenery( NULL ),
     tile_mgr( NULL ),
     io( new FGIO ),
+    fontcache ( new FGFontCache ),
     navlist( NULL ),
     loclist( NULL ),
     gslist( NULL ),
@@ -100,8 +103,8 @@ FGGlobals::~FGGlobals()
     delete event_mgr;
     delete initial_state;
     delete props;
-    delete commands;
     delete io;
+    delete fontcache;
     delete renderer;
     delete initial_waypoints;
 }