From: mfranz <mfranz>
Date: Tue, 14 Mar 2006 15:28:29 +0000 (+0000)
Subject: close Aircraft/ dir after scanning for *-set.xml files
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f82a8fba52a52e855775a574d12e17122cc53764;p=flightgear.git

close Aircraft/ dir after scanning for *-set.xml files
---

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 9f210ef7e..95ac6684a 100644
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -516,6 +516,7 @@ static string fgFindAircraftPath( const SGPath &path, const string &aircraft ) {
         exit(-1);
     }
 
+    string result;
     while ((dire = ulReadDir(dirp)) != NULL) {
         if (dire->d_isdir) {
             if ( strcmp("CVS", dire->d_name) && strcmp(".", dire->d_name)
@@ -524,19 +525,18 @@ static string fgFindAircraftPath( const SGPath &path, const string &aircraft ) {
                 SGPath next = path;
                 next.append(dire->d_name);
 
-                string result = fgFindAircraftPath( next, aircraft );
+                result = fgFindAircraftPath( next, aircraft );
                 if ( ! result.empty() ) {
-                    return result;
+                    break;
                 }
             }
         } else if ( !strcmp(dire->d_name, aircraft.c_str()) ) {
-            return path.str();
+            result = path.str();
         }
     }
 
     ulCloseDir(dirp);
-
-    return "";
+    return result;
 }