fixes to wxFindFirstFile

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 11de9801ba2204bd1f160d423ea2bc2580977042..c8b6040148df31cc83f9aa96ed2c12b4da05abe0 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -1336,7 +1336,10 @@ wxString wxFindFirstFile(const wxChar *spec, int flags)
     wxString result;
     gs_dir->GetFirst(&result, wxFileNameFromPath(spec), dirFlags);
     if ( result.IsEmpty() )
     wxString result;
     gs_dir->GetFirst(&result, wxFileNameFromPath(spec), dirFlags);
     if ( result.IsEmpty() )

+    {

         wxDELETE(gs_dir);
         wxDELETE(gs_dir);

+        return result;
+    }

 
     return gs_dirPath + result;
 }
 
     return gs_dirPath + result;
 }


@@ -1349,7 +1352,10 @@ wxString wxFindNextFile()
     gs_dir->GetNext(&result);
     
     if ( result.IsEmpty() )
     gs_dir->GetNext(&result);
     
     if ( result.IsEmpty() )

+    {

         wxDELETE(gs_dir);
         wxDELETE(gs_dir);

+        return result;
+    }

     
     return gs_dirPath + result;
 }
     
     return gs_dirPath + result;
 }