Make Traffic-via-terrasync conditional

GUI dialog already set the property, just need to pick it up.

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 40af6e292fb89605037f9107e61fc3c3fe366490..a3b1338b3605cd0de75aaa337d32b9713c571c8f 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -101,6 +101,11 @@ static void fgMainLoop( void )
 
 static void initTerrasync()
 {
+    // add the terrasync root as a data path so data can be retrieved from it
+    // (even if we are in read-only mode)
+    std::string terraSyncDir(fgGetString("/sim/terrasync/scenery-dir"));
+    globals->append_data_path(terraSyncDir);
+    
     if (fgGetBool("/sim/fghome-readonly", false)) {
         return;
     }
@@ -127,10 +132,6 @@ static void initTerrasync()
     
     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()

diff --git a/src/Traffic/TrafficMgr.cxx b/src/Traffic/TrafficMgr.cxx
index dfd8885f01c2cbedac3abc95b2dfcf2dbeaa0019..4641d3f21519a79babe159008ea2e2d9853c3401 100644 (file)
--- a/src/Traffic/TrafficMgr.cxx
+++ b/src/Traffic/TrafficMgr.cxx
@@ -494,9 +494,10 @@ void FGTrafficManager::init()
 
     assert(!doingInit);
     simgear::SGTerraSync* terraSync = static_cast<simgear::SGTerraSync*>(globals->get_subsystem("terrasync"));
-    
-    if (terraSync) {
+    bool doDataSync = fgGetBool("/sim/terrasync/ai-data-enabled");
+    if (doDataSync && terraSync) {
         if (!trafficSyncRequested) {
+            SG_LOG(SG_AI, SG_INFO, "Sync of AI traffic via TerraSync enabled");
             terraSync->scheduleDataDir("AI/Traffic");
             trafficSyncRequested = true;
         }