]> git.mxchange.org Git - flightgear.git/blobdiff - src/Network/ATC-Main.cxx
Fix for bug 1304 - crash loading XML route
[flightgear.git] / src / Network / ATC-Main.cxx
index bdaf70936f40313a5ffa1158357c7f007ad65e55..6c0da9bd96f400b86c3973ae3f9eb51780de72f8 100644 (file)
@@ -46,6 +46,7 @@
 #include <simgear/math/sg_types.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/props/props.hxx>
+#include <simgear/structure/exception.hxx>
 
 #include <Scripting/NasalSys.hxx>
 #include <Main/fg_props.hxx>
@@ -54,7 +55,9 @@
 #include "ATC-Main.hxx"
 
 using std::string;
-
+using std::cout;
+using std::endl;
+using std::vector;
 
 // Lock the ATC hardware
 static int fgATCMainLock( int fd ) {
@@ -96,7 +99,7 @@ void FGATCMain::init_config() {
         SGPath atcsim_config( envp );
         atcsim_config.append( ".fgfs-atc610x.xml" );
        try {
-         SG_LOG(SG_GENERAL, SG_ALERT,
+         SG_LOG(SG_NETWORK, SG_ALERT,
                 "Warning: loading deprecated config file: " <<
                 atcsim_config.str() );
          readProperties( atcsim_config.str(), globals->get_props() );
@@ -222,7 +225,7 @@ bool FGATCMain::process() {
     FGNasalSys *n = (FGNasalSys*)globals->get_subsystem("nasal");
     bool result = n->parseAndRun( "atcsim.update()" );
     if ( !result ) {
-        SG_LOG( SG_GENERAL, SG_ALERT, "Nasal: atcsim.update() failed!" );
+        SG_LOG( SG_NETWORK, SG_ALERT, "Nasal: atcsim.update() failed!" );
     }
 
     // process the ATC outputs