[Scummvm-git-logs] scummvm master -> 6a648e185c9585cc76ef346b2b299ae1b35708c9

[sev-]

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:
6a648e185c DIRECTOR: More robust path handling


Commit: 6a648e185c9585cc76ef346b2b299ae1b35708c9
    https://github.com/scummvm/scummvm/commit/6a648e185c9585cc76ef346b2b299ae1b35708c9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-21T01:34:29+01:00

Commit Message:
DIRECTOR: More robust path handling

Changed paths:
    engines/director/director.cpp
    engines/director/util.cpp


diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 5f37776..2294ee4 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -203,9 +203,6 @@ Common::Error DirectorEngine::run() {
 
 				Common::String sname = name->readPascalString();
 
-				if (!sname.hasPrefix(":"))
-					sname = ":" + sname;
-
 				_nextMovie.movie = pathMakeRelative(sname);
 				warning("Replaced score name with: %s (from %s)", _nextMovie.movie.c_str(), sname.c_str());
 
diff --git a/engines/director/util.cpp b/engines/director/util.cpp
index fca3cc7..3e3256a 100644
--- a/engines/director/util.cpp
+++ b/engines/director/util.cpp
@@ -115,12 +115,6 @@ Common::String convertPath(Common::String &path) {
 		return path;
 	}
 
-	if (path[0] != ':') {
-		warning("convertPath: unsupported absolute path '%s'", path.c_str());
-
-		return path;
-	}
-
 	Common::String res;
 	uint32 idx = 0;
 
@@ -129,7 +123,9 @@ Common::String convertPath(Common::String &path) {
 		idx = 2;
 	} else {
 		res = "./";
-		idx = 1;
+
+		if (path[0] == ':')
+			idx = 1;
 	}
 
 	while (idx != path.size()) {