aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMax Horn2010-11-07 17:16:01 +0000
committerMax Horn2010-11-07 17:16:01 +0000
commit036e88d382f653fd8590bb2edec2e45072f9d0be (patch)
treead6849dc98ad48827426b738c6dc2b7e20e3d6ee /engines
parentaa54388de09cbbb295fa08605af8bcab1ceadc3e (diff)
downloadscummvm-rg350-036e88d382f653fd8590bb2edec2e45072f9d0be.tar.gz
scummvm-rg350-036e88d382f653fd8590bb2edec2e45072f9d0be.tar.bz2
scummvm-rg350-036e88d382f653fd8590bb2edec2e45072f9d0be.zip
DETECTOR: Don't compute mac resource fork MD5 of a file multiple times
Also add a FIXME regarding the fact that we don't handle the case that a file is listed as a regular file and as one with resource fork. svn-id: r54120
Diffstat (limited to 'engines')
-rw-r--r--engines/advancedDetector.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index e030cba72a..d48fd61118 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -449,6 +449,12 @@ static ADGameDescList detectGame(const Common::FSList &fslist, const ADParams &p
Common::String fname = fileDesc->fileName;
SizeMD5 tmp;
+ if (filesSizeMD5.contains(fname))
+ continue;
+
+ // FIXME/TODO: We don't handle the case that a file is listed as a regular
+ // file and as one with resource fork.
+
if (g->flags & ADGF_MACRESFORK) {
Common::MacResManager *macResMan = new Common::MacResManager();
@@ -462,7 +468,7 @@ static ADGameDescList detectGame(const Common::FSList &fslist, const ADParams &p
delete macResMan;
} else {
- if (allFiles.contains(fname) && !filesSizeMD5.contains(fname)) {
+ if (allFiles.contains(fname)) {
debug(3, "+ %s", fname.c_str());
Common::File testFile;