From aaced28b98cb8f495e03093a3a0f8fa13501f87c Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Thu, 1 Dec 2022 02:09:36 +0100
Subject: [PATCH] GUI: Switch debugger to openFileOrDataFork

---
 gui/debugger.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gui/debugger.cpp b/gui/debugger.cpp
index 332c9c1708d..24d1176e84a 100644
--- a/gui/debugger.cpp
+++ b/gui/debugger.cpp
@@ -716,7 +716,8 @@ bool Debugger::cmdMd5Mac(int argc, const char **argv) {
 		if (!macResMan.open(filename)) {
 			debugPrintf("Resource file '%s' not found\n", filename.c_str());
 		} else {
-			if (!macResMan.hasResFork() && !macResMan.hasDataFork()) {
+			Common::ScopedPtr<Common::SeekableReadStream> dataFork(Common::MacResManager::openFileOrDataFork(filename));
+			if (!macResMan.hasResFork() && !dataFork) {
 				debugPrintf("'%s' has neither data not resource fork\n", macResMan.getBaseFileName().toString().c_str());
 			} else {
 				// The resource fork is probably the most relevant one.
@@ -726,14 +727,13 @@ bool Debugger::cmdMd5Mac(int argc, const char **argv) {
 						md5 += Common::String::format(" (%s %d bytes)", tail ? "last" : "first", length);
 					debugPrintf("%s (resource): %s, %llu bytes\n", macResMan.getBaseFileName().toString().c_str(), md5.c_str(), (unsigned long long)macResMan.getResForkDataSize());
 				}
-				if (macResMan.hasDataFork()) {
-					Common::SeekableReadStream *stream = macResMan.getDataFork();
-					if (tail && stream->size() > length)
-						stream->seek(-length, SEEK_END);
-					Common::String md5 = Common::computeStreamMD5AsString(*stream, length);
-					if (length != 0 && length < stream->size())
+				if (dataFork) {
+					if (tail && dataFork->size() > length)
+						dataFork->seek(-length, SEEK_END);
+					Common::String md5 = Common::computeStreamMD5AsString(*dataFork, length);
+					if (length != 0 && length < dataFork->size())
 						md5 += Common::String::format(" (%s %d bytes)", tail ? "last" : "first", length);
-					debugPrintf("%s (data): %s, %llu bytes\n", macResMan.getBaseFileName().toString().c_str(), md5.c_str(), (unsigned long long)stream->size());
+					debugPrintf("%s (data): %s, %llu bytes\n", macResMan.getBaseFileName().toString().c_str(), md5.c_str(), (unsigned long long)dataFork->size());
 				}
 			}
 			macResMan.close();