[Scummvm-git-logs] scummvm master -> 602eeec387e2a880c3a0122a2c1bcc910d169e8a

sev- noreply at scummvm.org
Fri Dec 9 00:31:15 UTC 2022


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
602eeec387 COMMON: Fix handling of / that caused The 7 colors to fail


Commit: 602eeec387e2a880c3a0122a2c1bcc910d169e8a
    https://github.com/scummvm/scummvm/commit/602eeec387e2a880c3a0122a2c1bcc910d169e8a
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2022-12-09T01:31:11+01:00

Commit Message:
COMMON: Fix handling of / that caused The 7 colors to fail

Implicit conversion of string to path caused splitting by / instead of
intended by DIR_SEPARATOR

Changed paths:
    common/fs.cpp


diff --git a/common/fs.cpp b/common/fs.cpp
index 6785e2ec0af..cb67c45b12f 100644
--- a/common/fs.cpp
+++ b/common/fs.cpp
@@ -309,7 +309,7 @@ void FSDirectory::cacheDirectoryRecursive(FSNode node, int depth, const Path& pr
 						        Common::toPrintable(name).c_str());
 					}
 				}
-				cacheDirectoryRecursive(*it, depth - 1, _flat ? prefix : lowercaseName + DIR_SEPARATOR);
+				cacheDirectoryRecursive(*it, depth - 1, _flat ? prefix : Common::Path(lowercaseName + DIR_SEPARATOR, DIR_SEPARATOR));
 				_subDirCache[lowercaseName] = *it;
 			}
 		} else {




More information about the Scummvm-git-logs mailing list