[Scummvm-git-logs] scummvm master -> 20fa33a6890abac60592effd2d00a467f7340a7d

[npjg]

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:
20fa33a689 DIRECTOR: Check if path is good before changing


Commit: 20fa33a6890abac60592effd2d00a467f7340a7d
    https://github.com/scummvm/scummvm/commit/20fa33a6890abac60592effd2d00a467f7340a7d
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-08-04T22:25:50-04:00

Commit Message:
DIRECTOR: Check if path is good before changing

For Virtual Murder: Brett game (id murderbrett), a script takes care of making
the path proper and trampling on that causes loading to fail.

Changed paths:
    engines/director/util.cpp


diff --git a/engines/director/util.cpp b/engines/director/util.cpp
index 9985cfb89c..4ad4468e92 100644
--- a/engines/director/util.cpp
+++ b/engines/director/util.cpp
@@ -305,6 +305,9 @@ bool testPath(Common::String &path) {
 Common::String pathMakeRelative(Common::String path, bool recursive, bool addexts) {
 	Common::String initialPath(path);
 
+	if (testPath(initialPath))
+		return initialPath;
+
 	if (recursive) // first level
 		initialPath = convertPath(initialPath);