From ad693ee768ee3a4e79fafbb9dfb33d1169522456 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 26 Aug 2016 11:25:39 +0300
Subject: SCI: Add a sanity check in wrapFilename(), as in unwrapFilename()

---
 engines/sci/sci.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 900dabe05a..86c0cffe15 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() {
-- 
cgit v1.2.3