[Scummvm-git-logs] scummvm master -> 56269d4e0b42fb180119f982f5b63ccef3e300c7

[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:
56269d4e0b QDENGINE: Do not transcode filenames prematurely for external sound tracks


Commit: 56269d4e0b42fb180119f982f5b63ccef3e300c7
    https://github.com/scummvm/scummvm/commit/56269d4e0b42fb180119f982f5b63ccef3e300c7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-09-21T00:20:18+02:00

Commit Message:
QDENGINE: Do not transcode filenames prematurely for external sound tracks

Changed paths:
    engines/qdengine/qdcore/qd_file_manager.cpp
    engines/qdengine/qdcore/qd_game_dispatcher.cpp


diff --git a/engines/qdengine/qdcore/qd_file_manager.cpp b/engines/qdengine/qdcore/qd_file_manager.cpp
index 8e871b60bc5..836da9cff71 100644
--- a/engines/qdengine/qdcore/qd_file_manager.cpp
+++ b/engines/qdengine/qdcore/qd_file_manager.cpp
@@ -103,10 +103,10 @@ void qdFileManager::Finit() {
 bool qdFileManager::open_file(Common::SeekableReadStream **fh, const Common::Path file_name, bool err_message) {
 	debugC(4, kDebugLoad, "qdFileManager::open_file(%s)", transCyrillic(file_name.toString()));
 
-	if (SearchMan.hasFile(file_name)) {
+	if (SearchMan.hasFile((char *)transCyrillic(file_name.toString()))) {
 		Common::File *f = new Common::File;
 
-		if (f->open(file_name))
+		if (f->open((char *)transCyrillic(file_name.toString())))
 			*fh = f;
 		else
 			return false;
@@ -135,7 +135,7 @@ bool qdFileManager::open_file(Common::SeekableReadStream **fh, const Common::Pat
 		}
 	}
 
-	debugC(4, kDebugLoad, "qdFileManager::open_file(%s): NOT FOUND", transCyrillic(file_name.toString()));
+	warning("qdFileManager::open_file(%s) (%s): NOT FOUND", transCyrillic(file_name.toString()), file_name.toString().c_str());
 
 	return false;
 }
diff --git a/engines/qdengine/qdcore/qd_game_dispatcher.cpp b/engines/qdengine/qdcore/qd_game_dispatcher.cpp
index 74749993158..3adaf14283f 100644
--- a/engines/qdengine/qdcore/qd_game_dispatcher.cpp
+++ b/engines/qdengine/qdcore/qd_game_dispatcher.cpp
@@ -2670,7 +2670,6 @@ bool qdGameDispatcher::play_music_track(const qdMusicTrack *p, bool interface_mo
 	_interface_music_mode = interface_mode;
 
 	debugC(3, kDebugLoad, "qdGameDispatcher::play_music_track() %s", transCyrillic(fname.toString()));
-	fname = Common::Path((char *)transCyrillic(fname.toString()));
 
 	return mpegPlayer::instance().play(fname, p->is_cycled(), p->volume());
 }