libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-27 05:32:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DIRECTOR: do not try to open dirs as files

Browse Source
This commit is contained in:
Misty De Meo 2022-07-27 22:03:29 -07:00 committed by Misty De Méo
parent b03ad83379
commit 0c09bba0f6
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engines/director/util.cpp
View File

@ -393,6 +393,7 @@ Common::String getPath(Common::String path, Common::String cwd) {
bool testPath(Common::String &path, bool directory) { bool testPath(Common::String &path, bool directory) {
Common::FSNode d = Common::FSNode(*g_director->getGameDataDir()); Common::FSNode d = Common::FSNode(*g_director->getGameDataDir());
Common::FSNode node;
// Test if we have it right in the SearchMan // Test if we have it right in the SearchMan
if (SearchMan.hasFile(Common::Path(path, g_director->_dirSeparator))) if (SearchMan.hasFile(Common::Path(path, g_director->_dirSeparator)))
@ -426,12 +427,18 @@ bool testPath(Common::String &path, bool directory) {
// for each element in the path, choose the first FSNode // for each element in the path, choose the first FSNode
// with a case-insensitive matcing name // with a case-insensitive matcing name
if (i->getName().equalsIgnoreCase(token)) { if (i->getName().equalsIgnoreCase(token)) {
// If this is a directory, it's not a valid candidate
node = Common::FSNode(*i);
if (node.isDirectory()) {
continue;
}
exists = true; exists = true;
newPath += i->getName(); newPath += i->getName();
if (!directory_list.empty()) if (!directory_list.empty())
newPath += (g_director->_dirSeparator); newPath += (g_director->_dirSeparator);
d = Common::FSNode(*i); d = node;
break; break;
} }
} }