From 01136dc823572441c83af84cb233b2175600bd6c Mon Sep 17 00:00:00 2001 From: David Rose Date: Wed, 28 Feb 2007 18:23:50 +0000 Subject: [PATCH] check more aggressively for embedded .mf extension --- panda/src/express/patchfile.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/panda/src/express/patchfile.cxx b/panda/src/express/patchfile.cxx index 46319772e6..9aa051c855 100644 --- a/panda/src/express/patchfile.cxx +++ b/panda/src/express/patchfile.cxx @@ -29,6 +29,7 @@ #include "hashVal.h" #include // for tempnam +#include // for strstr #ifdef WIN32_VC #define tempnam _tempnam @@ -1328,7 +1329,8 @@ build(Filename file_orig, Filename file_new, Filename patch_name) { // Check whether our input files are Panda multifiles. bool is_multifile = false; if (_allow_multifile) { - if (file_orig.get_extension() == "mf" || file_new.get_extension() == "mf") { + if (strstr(file_orig.get_basename().c_str(), ".mf") != NULL || + strstr(file_new.get_basename().c_str(), ".mf") != NULL) { // Read the first n bytes of both files for the Multifile magic // number. string magic_number = Multifile::get_magic_number();