[Scummvm-git-logs] scummvm master -> 833b4bfaa5050e2d72b001f9aded5cc1a4bdd6e2

[tnm23]

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:
833b4bfaa5 ZVISION: Fix bug arising from previous adjustment to initializePath.


Commit: 833b4bfaa5050e2d72b001f9aded5cc1a4bdd6e2
    https://github.com/scummvm/scummvm/commit/833b4bfaa5050e2d72b001f9aded5cc1a4bdd6e2
Author: Thomas N McEwan (46427621+tnm23 at users.noreply.github.com)
Date: 2026-01-29T11:37:22Z

Commit Message:
ZVISION: Fix bug arising from previous adjustment to initializePath.
Patched versions of Nemesis options menu no longer crash when changing subtitle settings.

Changed paths:
    engines/zvision/zvision.cpp


diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index bd7b867a7b7..d2d8beaab1f 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -399,6 +399,17 @@ void ZVision::initializePath(const Common::FSNode &gamePath) {
 	SearchMan.setIgnoreClashes(true);
 
 	SearchMan.addDirectory(gamePath, 0, 1, true);
+
+	// Ensure addons (game patches) take search priority over files listed in .zix files
+	SearchMan.addSubDirectoryMatching(gameDataDir, "addon");
+	Common::ArchiveMemberList listAddon;
+	SearchMan.listMatchingMembers(listAddon,"*.zfs");
+	for (auto &member : listAddon) {
+		Common::Path path(member->getPathInArchive());
+		ZfsArchive *archive = new ZfsArchive(path);
+		SearchMan.add(path.toString(), archive);
+	}
+
 	switch (getGameId()) {
 	case GID_GRANDINQUISITOR:
 		break;
@@ -420,16 +431,6 @@ void ZVision::initializePath(const Common::FSNode &gamePath) {
 		SearchMan.addSubDirectoryMatching(gameExtraDir, "auxscr");
 	}
 
-	// Ensure addons (game patches) take search priority over files listed in .zix files
-	SearchMan.addSubDirectoryMatching(gameDataDir, "addon");
-	Common::ArchiveMemberList listAddon;
-	SearchMan.listMatchingMembers(listAddon,"*.zfs");
-	for (auto &member : listAddon) {
-		Common::Path path(member->getPathInArchive());
-		ZfsArchive *archive = new ZfsArchive(path);
-		SearchMan.add(path.toString(), archive);
-	}
-
 	switch (getGameId()) {
 	case GID_GRANDINQUISITOR:
 		if (!_fileManager->loadZix("INQUIS.ZIX", gameDataDir))