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

fix for a fatal bug in wxMGL's wxDir

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-12-30 00:05:35 +00:00
parent a3e76614ad
commit fd4bc54da0
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mgl/dir.cpp
View File

@@ -116,10 +116,11 @@ bool wxDirData::Read(wxString *filename)
PM_findData data; PM_findData data;
bool matches = FALSE; bool matches = FALSE;
// speed up string concatenation in the loop a bit data.dwSize = sizeof(data);
wxString path = m_dirname; wxString path = m_dirname;
path += wxFILE_SEP_PATH; path += wxFILE_SEP_PATH;
path.reserve(path.length() + 255); path.reserve(path.length() + 255); // speed up string concatenation
while ( !matches ) while ( !matches )
{ {
@@ -197,17 +198,6 @@ bool wxDir::Open(const wxString& dirname)
delete M_DIR; delete M_DIR;
m_data = new wxDirData(dirname); m_data = new wxDirData(dirname);
if ( !M_DIR->IsOk() )
{
wxLogSysError(_("Can not enumerate files in directory '%s'"),
dirname.c_str());
delete M_DIR;
m_data = NULL;
return FALSE;
}
return TRUE; return TRUE;
} }