Merge branch 'maint' into next

[flightgear.git] / src / Airports / xmlloader.cxx

diff --git a/src/Airports/xmlloader.cxx b/src/Airports/xmlloader.cxx
index 1009f8a0e4ac76e5310ae1e4ad6766ed1e207efa..198f81c9e7b6fda4d00bdadf33bd0126202fc986 100644 (file)
--- a/src/Airports/xmlloader.cxx
+++ b/src/Airports/xmlloader.cxx
@@ -14,7 +14,9 @@
 //
 
 #include <simgear/misc/sg_path.hxx>
+
 #include <Main/globals.hxx>
+#include <Main/fg_props.hxx>
 
 #include "xmlloader.hxx"
 #include "dynamicloader.hxx"
@@ -27,11 +29,11 @@ XMLLoader::XMLLoader() {}
 XMLLoader::~XMLLoader() {}
 
 string XMLLoader::expandICAODirs(const string in){
-     cerr << "Expanding " << in << endl;
+     //cerr << "Expanding " << in << endl;
      if (in.size() == 4) {
           char buffer[11];
           snprintf(buffer, 11, "%c/%c/%c", in[0], in[1], in[2]);
-          cerr << "result: " << buffer << endl;
+          //cerr << "result: " << buffer << endl;
           return string(buffer);
      } else {
            return in;
@@ -67,12 +69,13 @@ void XMLLoader::load(FGAirportDynamics* d) {
                     try {
                         readXML(parkpath.str(), visitor);
                         d->init();
-                } 
-                catch (const sg_exception &e) {
+                    } 
+                    catch (const sg_exception &e) {
+                    }
+                    return;
                 }
-                return;
-             }
-         }
+            }
+        }
     }
 }