[Scummvm-cvs-logs] scummvm master -> ad693ee768ee3a4e79fafbb9dfb33d1169522456

[bluegr]

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:
ad693ee768 SCI: Add a sanity check in wrapFilename(), as in unwrapFilename()


Commit: ad693ee768ee3a4e79fafbb9dfb33d1169522456
    https://github.com/scummvm/scummvm/commit/ad693ee768ee3a4e79fafbb9dfb33d1169522456
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2016-08-26T11:26:09+03:00

Commit Message:
SCI: Add a sanity check in wrapFilename(), as in unwrapFilename()

Changed paths:
    engines/sci/sci.cpp



diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 900dabe..86c0cff 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -923,14 +923,19 @@ Common::String SciEngine::getFilePrefix() const {
 }
 
 Common::String SciEngine::wrapFilename(const Common::String &name) const {
-	return getFilePrefix() + "-" + name;
+	Common::String prefix = getFilePrefix() + "-";
+	if (name.hasPrefix(prefix.c_str()))
+		return name;
+	else
+		return prefix + name;
 }
 
 Common::String SciEngine::unwrapFilename(const Common::String &name) const {
 	Common::String prefix = getFilePrefix() + "-";
 	if (name.hasPrefix(prefix.c_str()))
 		return Common::String(name.c_str() + prefix.size());
-	return name;
+	else
+		return name;
 }
 
 const char *SciEngine::getGameObjectName() {