* added checking if the archive file has any files in it, because new 7z.dll confuses FDS files with archives (it recognizes the first "F" as a signature of an archive)

2013-04-29 12:52:43 +00:00 · 2013-04-29 12:52:43 +00:00 · 24f16b670c
parent 4597f8543c
commit 24f16b670c
1 changed files with 4 additions and 0 deletions
--- a/trunk/src/drivers/win/archive.cpp
+++ b/trunk/src/drivers/win/archive.cpp
@ -438,6 +438,10 @@ ArchiveScanRecord FCEUD_ScanArchive(std::string fname)

 			if (SUCCEEDED(object->GetNumberOfItems(&numFiles)))
 			{
+				// AnS: added this check, because new 7z confuses FDS files with archives (it recognizes the first "F" as a signature of an archive)
+				if (numFiles == 0)
+					goto bomb;
+
 				ArchiveScanRecord asr(matchingFormat,(int)numFiles);

 				//scan the filename of each item