From acd32ffcdb319f162633c20e0202db3f8542998a Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Thu, 26 Feb 2009 00:13:03 +0000 Subject: [PATCH] fixed wxXmlResource::Load's detection of filenames to be done as early as possible git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/xrc/xmlres.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp index 65cc83c85e..b8d8b35601 100644 --- a/src/xrc/xmlres.cpp +++ b/src/xrc/xmlres.cpp @@ -178,8 +178,10 @@ bool wxXmlResource::IsArchive(const wxString& filename) #endif // wxUSE_FILESYSTEM -bool wxXmlResource::Load(const wxString& filemask) +bool wxXmlResource::Load(const wxString& filemask_) { + wxString filemask = ConvertFileNameToURL(filemask_); + #if wxUSE_FILESYSTEM wxFileSystem fsys; # define wxXmlFindFirst fsys.FindFirst(filemask, wxFILE) @@ -197,8 +199,6 @@ bool wxXmlResource::Load(const wxString& filemask) while (!fnd.empty()) { - fnd = ConvertFileNameToURL(fnd); - #if wxUSE_FILESYSTEM if ( IsArchive(fnd) ) { -- 2.47.2