X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e06cac589d01918e1eeb34dc08ed67719a6cb44f..7c11806499166993dffcbb99139d5b248a2c6c82:/src/common/fs_zip.cpp diff --git a/src/common/fs_zip.cpp b/src/common/fs_zip.cpp index 136cbb9d37..d2210718ce 100644 --- a/src/common/fs_zip.cpp +++ b/src/common/fs_zip.cpp @@ -166,7 +166,7 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags) if (m_AllowDirs) { delete m_DirsFound; - m_DirsFound = new wxLongToLongHashMap(); + m_DirsFound = new wxZipFilenameHashMap(); } return DoFind(); } @@ -205,12 +205,9 @@ wxString wxZipFSHandler::DoFind() dir = namestr.BeforeLast(wxT('/')); while (!dir.IsEmpty()) { - long key = 0; - for (size_t i = 0; i < dir.Length(); i++) key += (wxUChar)dir[i]; - wxLongToLongHashMap::iterator it = m_DirsFound->find(key); - if (it == m_DirsFound->end()) + if( m_DirsFound->find(dir) == m_DirsFound->end() ) { - (*m_DirsFound)[key] = 1; + (*m_DirsFound)[dir] = 1; filename = dir.AfterLast(wxT('/')); dir = dir.BeforeLast(wxT('/')); if (!filename.IsEmpty() && m_BaseDir == dir &&