[Scummvm-git-logs] scummvm master -> 08c3bfe6d65e0d9e22a57016acaec1b46ae6f72f

[mistydemeo]

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:
08c3bfe6d6 DIRECTOR: do not trim path during search


Commit: 08c3bfe6d65e0d9e22a57016acaec1b46ae6f72f
    https://github.com/scummvm/scummvm/commit/08c3bfe6d65e0d9e22a57016acaec1b46ae6f72f
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2022-11-11T16:40:39-08:00

Commit Message:
DIRECTOR: do not trim path during search

This was introduced in 3cae55dc3a78ad2cbbac9179c2dc659096f1cf04 due
to a bug encountered in Majestic. That was, however, a distinct bug
caused by something else, and the root cause was fixed in
9c3de4c269b4edb804a791c21883009d26b67f36. Trimming whitespace broke
games which loaded paths that legitimately began with whitespace. This
notably broke Wacky Races (Mac, Japan), which has directories that begin
with a single space.

Changed paths:
    engines/director/util.cpp


diff --git a/engines/director/util.cpp b/engines/director/util.cpp
index 794e0a2e300..894d5004cce 100644
--- a/engines/director/util.cpp
+++ b/engines/director/util.cpp
@@ -508,9 +508,6 @@ Common::String wrappedPathMakeRelative(Common::String path, bool recursive, bool
 
 	debug(9, "wrappedPathMakeRelative(): s2 %s", convPath.c_str());
 
-	// Strip the leading whitespace from the path
-	initialPath.trim();
-
 	if (testPath(initialPath, directory))
 		return initialPath;