Fix bug 141, by ensuring certain subsystems are assigned to the 'post FDM' group...

[flightgear.git] / src / Network / ATC-Main.cxx

diff --git a/src/Network/ATC-Main.cxx b/src/Network/ATC-Main.cxx
index 4529733fd1da4990b185f5c4d7c66d2c20bf02d4..b70b4abf36eb584ce1d6ffd726a8d093000c1f64 100644 (file)
--- a/src/Network/ATC-Main.cxx
+++ b/src/Network/ATC-Main.cxx
@@ -32,15 +32,16 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdio.h>              //snprintf
-#if defined( _MSC_VER ) || defined(__MINGW32__)
+#ifdef _WIN32
 #  include <io.h>                 //lseek, read, write
 #endif
 
-#include STL_STRING
+#include <string>
 
 #include <plib/ul.h>
 
 #include <simgear/debug/logstream.hxx>
+#include <simgear/props/props_io.hxx>
 #include <simgear/io/iochannel.hxx>
 #include <simgear/math/sg_types.hxx>
 #include <simgear/misc/sg_path.hxx>
@@ -52,7 +53,7 @@
 
 #include "ATC-Main.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 
 // Lock the ATC hardware
@@ -94,7 +95,15 @@ void FGATCMain::init_config() {
     if ( envp != NULL ) {
         SGPath atcsim_config( envp );
         atcsim_config.append( ".fgfs-atc610x.xml" );
-        readProperties( atcsim_config.str(), globals->get_props() );
+       try {
+         SG_LOG(SG_GENERAL, SG_ALERT,
+                "Warning: loading deprecated config file: " <<
+                atcsim_config.str() );
+         readProperties( atcsim_config.str(), globals->get_props() );
+       } catch (const sg_exception &e) {
+         // fail silently, this is an old style config file I want to continue
+         // to support if it exists.
+       }
     }
 #endif
 }