[Scummvm-git-logs] scummvm master -> 40bfc6b8797ac3d4f0ee5e50531d05c846696b7e

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
40bfc6b879 MTROPOLIS: ignore COPYING.MPL from source tree in main segment search


Commit: 40bfc6b8797ac3d4f0ee5e50531d05c846696b7e
    https://github.com/scummvm/scummvm/commit/40bfc6b8797ac3d4f0ee5e50531d05c846696b7e
Author: Michael Kuerbis (michael_kuerbis at web.de)
Date: 2026-04-29T11:49:31+03:00

Commit Message:
MTROPOLIS: ignore COPYING.MPL from source tree in main segment search

Changed paths:
    engines/mtropolis/boot.cpp


diff --git a/engines/mtropolis/boot.cpp b/engines/mtropolis/boot.cpp
index 0c60ecc6b45..19501dc2765 100644
--- a/engines/mtropolis/boot.cpp
+++ b/engines/mtropolis/boot.cpp
@@ -2669,14 +2669,21 @@ void findWindowsMainSegment(Common::Archive &fs, const BootScriptContext &bootSc
 	if (bootScriptContext.getMainSegmentFileOverride().empty()) {
 		fs.listMembers(allFiles);
 
+		const Common::Path copyingPath("workspace/LICENSES/COPYING.MPL");
+
 		for (const Common::ArchiveMemberPtr &archiveMember : allFiles) {
 			Common::String fileName = archiveMember->getFileName();
 
 			for (const char *suffix : mainSegmentSuffixes) {
 				if (fileName.hasSuffixIgnoreCase(suffix)) {
-					filteredFiles.push_back(archiveMember);
-					debug(4, "Identified possible main segment file %s", archiveMember->getPathInArchive().toString(fs.getPathSeparator()).c_str());
-					break;
+					// Ignore LICENSES/COPYING.MPL from the ScummVM source tree
+					if (archiveMember->getPathInArchive() != copyingPath) {
+						filteredFiles.push_back(archiveMember);
+						debug(4, "Identified possible main segment file %s", archiveMember->getPathInArchive().toString(fs.getPathSeparator()).c_str());
+						break;
+					} else {
+						debug(4, "Ignoring unlikely main segment file %s", archiveMember->getPathInArchive().toString(fs.getPathSeparator()).c_str());
+					}
 				}
 			}
 		}