Merge branch 'next' into durk-atc

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

diff --git a/src/Airports/xmlloader.cxx b/src/Airports/xmlloader.cxx
index b5bce6345883194ddcdf7fb69d3e73979661991a..3d65f7756611241764dab8025d71da53682c44d1 100644 (file)
--- a/src/Airports/xmlloader.cxx
+++ b/src/Airports/xmlloader.cxx
@@ -14,8 +14,8 @@
 //
 
 #include <simgear/misc/sg_path.hxx>
-
 #include <simgear/xml/easyxml.hxx>
+#include <simgear/misc/strutils.hxx>
 
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
@@ -85,8 +85,7 @@ bool XMLLoader::findAirportData(const std::string& aICAO,
     const std::string& aFileName, SGPath& aPath)
 {
   string fileName(aFileName);
-  int extPos = fileName.size() - 4;
-  if ((int) fileName.rfind(".xml") != extPos) {
+  if (!simgear::strutils::ends_with(aFileName, ".xml")) {
     fileName.append(".xml");
   }