From 9e345132b9a9dc1e9c44557b890baf8ba61fd195 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Sun, 9 Jun 2013 23:09:13 +0200 Subject: [PATCH] Shortcut IdentifyFile (which is now used by GameInfoCache) by trusting the file extensions. --- Core/Loaders.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Core/Loaders.cpp b/Core/Loaders.cpp index 0ea66d30a2..aa2bf444b3 100644 --- a/Core/Loaders.cpp +++ b/Core/Loaders.cpp @@ -34,6 +34,16 @@ EmuFileType Identify_File(std::string &filename) return FILETYPE_ERROR; } + std::string extension = filename.substr(filename.size() - 4); + if (!strcasecmp(extension.c_str(),".iso")) + { + return FILETYPE_PSP_ISO; + } + else if (!strcasecmp(extension.c_str(),".cso")) + { + return FILETYPE_PSP_ISO; + } + // First, check if it's a directory with an EBOOT.PBP in it. FileInfo info; if (!getFileInfo(filename.c_str(), &info)) { @@ -75,8 +85,6 @@ EmuFileType Identify_File(std::string &filename) fclose(f); - std::string extension = filename.substr(filename.size() - 4); - if (id == 'FLE\x7F') { if (!strcasecmp(extension.c_str(), ".plf") || strstr(filename.c_str(),"BOOT.BIN") || @@ -110,14 +118,6 @@ EmuFileType Identify_File(std::string &filename) ERROR_LOG(LOADER, "A PBP with the wrong magic number?"); return FILETYPE_PSP_PBP; } - else if (!strcasecmp(extension.c_str(),".iso")) - { - return FILETYPE_PSP_ISO; - } - else if (!strcasecmp(extension.c_str(),".cso")) - { - return FILETYPE_PSP_ISO; - } else if (!strcasecmp(extension.c_str(),".bin")) { return FILETYPE_UNKNOWN_BIN;