summaryrefslogtreecommitdiffstats
path: root/src/core/loader/loader.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-01-20 20:55:54 +0100
committerbunnei <bunneidev@gmail.com>2018-01-20 20:59:44 +0100
commit023aef053c96c92c9ea15d067f7d2cb7150585d6 (patch)
tree6b8a4c0dc9aae92ff172a2715969b8551e9d14b1 /src/core/loader/loader.cpp
parentnso: Remove code specific to directory loading. (diff)
downloadyuzu-023aef053c96c92c9ea15d067f7d2cb7150585d6.tar
yuzu-023aef053c96c92c9ea15d067f7d2cb7150585d6.tar.gz
yuzu-023aef053c96c92c9ea15d067f7d2cb7150585d6.tar.bz2
yuzu-023aef053c96c92c9ea15d067f7d2cb7150585d6.tar.lz
yuzu-023aef053c96c92c9ea15d067f7d2cb7150585d6.tar.xz
yuzu-023aef053c96c92c9ea15d067f7d2cb7150585d6.tar.zst
yuzu-023aef053c96c92c9ea15d067f7d2cb7150585d6.zip
Diffstat (limited to 'src/core/loader/loader.cpp')
-rw-r--r--src/core/loader/loader.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp
index 92defd381..2ecccdd4f 100644
--- a/src/core/loader/loader.cpp
+++ b/src/core/loader/loader.cpp
@@ -21,11 +21,11 @@ const std::initializer_list<Kernel::AddressMapping> default_address_mappings = {
{0x1F000000, 0x600000, false}, // entire VRAM
};
-FileType IdentifyFile(FileUtil::IOFile& file) {
+FileType IdentifyFile(FileUtil::IOFile& file, const std::string& filepath) {
FileType type;
#define CHECK_TYPE(loader) \
- type = AppLoader_##loader::IdentifyType(file); \
+ type = AppLoader_##loader::IdentifyType(file, filepath); \
if (FileType::Error != type) \
return type;
@@ -45,13 +45,13 @@ FileType IdentifyFile(const std::string& file_name) {
return FileType::Unknown;
}
- return IdentifyFile(file);
+ return IdentifyFile(file, file_name);
}
FileType GuessFromExtension(const std::string& extension_) {
std::string extension = Common::ToLower(extension_);
- if (extension == ".elf" || extension == ".axf")
+ if (extension == ".elf")
return FileType::ELF;
else if (extension == ".nro")
return FileType::NRO;
@@ -117,7 +117,7 @@ std::unique_ptr<AppLoader> GetLoader(const std::string& filename) {
std::string filename_filename, filename_extension;
Common::SplitPath(filename, nullptr, &filename_filename, &filename_extension);
- FileType type = IdentifyFile(file);
+ FileType type = IdentifyFile(file, filename);
FileType filename_type = GuessFromExtension(filename_extension);
if (type != filename_type) {