[Scummvm-git-logs] scummvm master -> d9ac5ca9595ca0915276fa9d77f4170ae40525d0
aquadran
noreply at scummvm.org
Wed Jul 16 19:25:01 UTC 2025
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:
d9ac5ca959 WINTERMUTE: Skip already added archive.
Commit: d9ac5ca9595ca0915276fa9d77f4170ae40525d0
https://github.com/scummvm/scummvm/commit/d9ac5ca9595ca0915276fa9d77f4170ae40525d0
Author: PaweÅ KoÅodziejski (aquadran at gmail.com)
Date: 2025-07-16T21:24:56+02:00
Commit Message:
WINTERMUTE: Skip already added archive.
Fix fixing adding duplicated same file xlanguage_en.dcp in Reversion 3.
Changed paths:
engines/wintermute/base/base_file_manager.cpp
diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp
index 7fad0cf75e2..4f6aea7dc03 100644
--- a/engines/wintermute/base/base_file_manager.cpp
+++ b/engines/wintermute/base/base_file_manager.cpp
@@ -331,6 +331,11 @@ bool BaseFileManager::registerPackages() {
}
bool BaseFileManager::registerPackage(Common::FSNode file, const Common::String &filename, bool searchSignature) {
+ if (_packages.hasArchive(filename.c_str())) {
+ debugC(kWintermuteDebugFileAccess, "BaseFileManager::registerPackage - file %s already added to archive", filename.c_str());
+ return STATUS_FAILED;
+ }
+
PackageSet *pack = new PackageSet(file, filename, searchSignature);
_packages.add(filename, pack, pack->getPriority() , true);
_versions[filename] = pack->getVersion();
More information about the Scummvm-git-logs
mailing list