Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure we pass the correct type of string to EscapeFileNameCharsInURL in wxWebViewArchiveHandler.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-10-06 10:01:17 +00:00
parent f2ae0da1b5
commit 2bcada5f33
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/webviewarchivehandler.cpp
View File

@@ -86,7 +86,7 @@ wxFSFile* wxWebViewArchiveHandler::GetFile(const wxString &uri)
return NULL; return NULL;
wxString fspath = "file:" + wxString fspath = "file:" +
EscapeFileNameCharsInURL(path.substr(doubleslash + 2)); EscapeFileNameCharsInURL(path.substr(doubleslash + 2).c_str());
return m_fileSystem->OpenFile(fspath); return m_fileSystem->OpenFile(fspath);
} }
//Otherwise we need to extract the protocol //Otherwise we need to extract the protocol
@@ -109,7 +109,7 @@ wxFSFile* wxWebViewArchiveHandler::GetFile(const wxString &uri)
return NULL; return NULL;
wxString fspath = "file:" + wxString fspath = "file:" +
EscapeFileNameCharsInURL(mainpath.substr(doubleslash + 2)) EscapeFileNameCharsInURL(mainpath.substr(doubleslash + 2).c_str())
+ "#" + protocol +":" + archivepath; + "#" + protocol +":" + archivepath;
return m_fileSystem->OpenFile(fspath); return m_fileSystem->OpenFile(fspath);
} }