One more Mac helper moved into CocoaHelpers.mm

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

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 47817c6f1bdb2febcecc8365e40912763fbf95a8..b5d9dfa67e85bcb13efe768fae31321f21c3cf7b 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -96,6 +96,39 @@ static void fgMainLoop( void )
     simgear::AtomicChangeListener::fireChangeListeners();
 }
 
+static void initTerrasync()
+{
+    if (fgGetBool("/sim/fghome-readonly", false)) {
+        return;
+    }
+    
+    // start TerraSync up now, so it can be synchronizing shared models
+    // and airports data in parallel with a nav-cache rebuild.
+    SGPath tsyncCache(globals->get_fg_home());
+    tsyncCache.append("terrasync-cache.xml");
+    
+    // wipe the cache file if requested
+    if (flightgear::Options::sharedInstance()->isOptionSet("restore-defaults")) {
+        SG_LOG(SG_GENERAL, SG_INFO, "restore-defaults requested, wiping terrasync update cache at " <<
+               tsyncCache);
+        if (tsyncCache.exists()) {
+            tsyncCache.remove();
+        }
+    }
+    
+    fgSetString("/sim/terrasync/cache-path", tsyncCache.c_str());
+    
+    simgear::SGTerraSync* terra_sync = new simgear::SGTerraSync();
+    terra_sync->setRoot(globals->get_props());
+    globals->add_subsystem("terrasync", terra_sync);
+    
+    terra_sync->bind();
+    terra_sync->init();
+    
+    // add the terrasync root as a data path so data can be retrieved from it
+    std::string terraSyncDir(fgGetString("/sim/terrasync/scenery-dir"));
+    globals->append_data_path(terraSyncDir);
+}
 
 static void registerMainLoop()
 {
@@ -126,25 +159,8 @@ static void fgIdleFunction ( void ) {
         }
 
     } else if ( idle_state == 2 ) {
-        
-        // start TerraSync up now, so it can be synchronizing shared models
-        // and airports data in parallel with a nav-cache rebuild.
-        SGPath tsyncCache(globals->get_fg_home());
-        tsyncCache.append("terrasync-cache.xml");
-        fgSetString("/sim/terrasync/cache-path", tsyncCache.c_str());
-        
-        simgear::SGTerraSync* terra_sync = new simgear::SGTerraSync(globals->get_props());
-        globals->add_subsystem("terrasync", terra_sync);
-        
-        
-        
-        terra_sync->bind();
-        terra_sync->init();
-        
-        // add the terrasync root as a data path so data can be retrieved from it
-        std::string terraSyncDir(fgGetString("/sim/terrasync/scenery-dir"));
-        globals->append_data_path(terraSyncDir);
-        
+
+        initTerrasync();
         idle_state++;
         fgSplashProgress("loading-nav-dat");
 
@@ -314,10 +330,14 @@ int fgMainInit( int argc, char **argv ) {
     sglog().setLogLevels( SG_ALL, SG_ALERT );
 
     globals = new FGGlobals;
-    fgInitHome();
+    if (!fgInitHome()) {
+        return EXIT_FAILURE;
+    }
     
-    // now home is initialised, we can log to a file inside it
-    logToFile();
+    if (!fgGetBool("/sim/fghome-readonly")) {
+        // now home is initialised, we can log to a file inside it
+        logToFile();
+    }
     
     std::string version;
 #ifdef FLIGHTGEAR_VERSION
@@ -328,12 +348,6 @@ int fgMainInit( int argc, char **argv ) {
     SG_LOG( SG_GENERAL, SG_INFO, "FlightGear:  Version "
             << version );
     SG_LOG( SG_GENERAL, SG_INFO, "Built with " << SG_COMPILER_STR << std::endl );
-    SG_LOG( SG_GL,
-            SG_INFO,
-            "osg::Referenced thread safe reference counting is "
-            << (osg::Referenced::getThreadSafeReferenceCounting() ? "enabled"
-                                                                  : "disabled")
-          );
 
     // Allocate global data structures.  This needs to happen before
     // we parse command line options
@@ -373,7 +387,8 @@ int fgMainInit( int argc, char **argv ) {
 
     // Clouds3D requires an alpha channel
     fgOSOpenWindow(true /* request stencil buffer */);
-
+    fgOSResetProperties();
+    
     // Initialize the splash screen right away
     fntInit();
     fgSplashInit();
@@ -387,6 +402,8 @@ int fgMainInit( int argc, char **argv ) {
     
     // pass control off to the master event handler
     int result = fgOSMainLoop();
+    frame_signal.clear();
+    fgOSCloseWindow();
     
     // clean up here; ensure we null globals to avoid
     // confusing the atexit() handler