From 0d111de090fde6f766e0acaf2daf070c002138c2 Mon Sep 17 00:00:00 2001
From: hax0kartik <agarwala.kartik@gmail.com>
Date: Thu, 10 Aug 2023 17:14:26 +0530
Subject: [PATCH] CRAB: Print cleansedPath instead of normal path in warnings

---
 engines/crab/filesystem.cpp         | 10 ++++++----
 engines/crab/music/MusicManager.cpp |  5 +++--
 engines/crab/music/musicparam.h     |  5 +++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/engines/crab/filesystem.cpp b/engines/crab/filesystem.cpp
index 0228c5200c3..fcc21a37062 100644
--- a/engines/crab/filesystem.cpp
+++ b/engines/crab/filesystem.cpp
@@ -48,8 +48,9 @@ bool fileOpen(const Common::Path &path, char *&data) {
 		delete[] data;
 
 	Common::File file;
-	if (!file.open(cleansePath(path.toString()))) {
-		warning("Unable to open file %s", path.toString().c_str());
+	Common::String cleansedPath = cleansePath(path.toString());
+	if (!file.open(cleansedPath)) {
+		warning("Unable to open file %s", cleansedPath.c_str());
 		data = nullptr;
 		return false;
 	}
@@ -73,8 +74,9 @@ bool fileOpen(const Common::Path &path, Common::File *file) {
 	if (file->isOpen())
 		file->close();
 
-	if (!file->open(cleansePath(path.toString()))) {
-		warning("Unable to open file %s", path.toString().c_str());
+	Common::String cleansedPath = cleansePath(path.toString());
+	if (!file->open(cleansedPath)) {
+		warning("Unable to open file %s", cleansedPath.c_str());
 		return false;
 	}
 
diff --git a/engines/crab/music/MusicManager.cpp b/engines/crab/music/MusicManager.cpp
index e3b8ea5fa62..9a9bf8efb84 100644
--- a/engines/crab/music/MusicManager.cpp
+++ b/engines/crab/music/MusicManager.cpp
@@ -131,13 +131,14 @@ bool MusicManager::load(rapidxml::xml_node<char> *node) {
 				rapidxml::xml_attribute<char> *id = n->first_attribute("id"), *path = n->first_attribute("path");
 				if (id != nullptr && path != nullptr) {
 					EffectAudio *audio = new EffectAudio();
-					if (audio->_file.open(cleansePath(path->value()))) {
+					Common::String cleansedPath = cleansePath(path->value());
+					if (audio->_file.open(cleansedPath)) {
 						audio->_handle = new Audio::SoundHandle();
 						audio->_stream = Audio::makeWAVStream(&audio->_file, DisposeAfterUse::NO);
 						_effects[stringToNumber<ChunkKey>(id->value())] = audio;
 					} else {
 						delete audio;
-						warning("Could not open audio file : %s", path->value());
+						warning("Could not open audio file : %s", cleansedPath.c_str());
 						return false;
 					}
 				}
diff --git a/engines/crab/music/musicparam.h b/engines/crab/music/musicparam.h
index e055bf79868..d1cb8ea5e5e 100644
--- a/engines/crab/music/musicparam.h
+++ b/engines/crab/music/musicparam.h
@@ -75,12 +75,13 @@ struct MusicData {
 		loadNum(_id, "id", node);
 		loadNum(_fadeInDuration, "fade_in", node);
 
-		if (_file.open(cleansePath(node->first_attribute("path")->value()))) {
+		Common::String cleansedPath = cleansePath(node->first_attribute("path")->value());
+		if (_file.open(cleansedPath)) {
 			Audio::SeekableAudioStream *stream = Audio::makeVorbisStream(&_file, DisposeAfterUse::NO);
 			// loops=0 means infinite here.
 			_track = Audio::makeLoopingAudioStream(stream, 0, 0, 0);
 		} else {
-			warning("Could not open file %s", node->first_attribute("path")->value());
+			warning("Could not open file %s", cleansedPath.c_str());
 		}
 	}
 };