diff options
| author | 2016-03-08 23:12:04 -0500 | |
|---|---|---|
| committer | 2016-03-08 23:12:04 -0500 | |
| commit | 8530a2d7df7f9546e3d4e9be2cec633307a28c23 (patch) | |
| tree | 9bcf963cc1a7c8c5700afe926fd43c08b2aaff96 /src/core/loader/loader.cpp | |
| parent | Merge pull request #1441 from MerryMage/dsp-pipes (diff) | |
| parent | Improve error report from Init() functions (diff) | |
| download | yuzu-8530a2d7df7f9546e3d4e9be2cec633307a28c23.tar.gz yuzu-8530a2d7df7f9546e3d4e9be2cec633307a28c23.tar.xz yuzu-8530a2d7df7f9546e3d4e9be2cec633307a28c23.zip | |
Merge pull request #1344 from LittleWhite-tb/error-output
Output errors in GUI
Diffstat (limited to 'src/core/loader/loader.cpp')
| -rw-r--r-- | src/core/loader/loader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp index 6b88169e1..b1907cd55 100644 --- a/src/core/loader/loader.cpp +++ b/src/core/loader/loader.cpp | |||
| @@ -137,11 +137,11 @@ ResultStatus LoadFile(const std::string& filename) { | |||
| 137 | AppLoader_NCCH app_loader(std::move(file), filename); | 137 | AppLoader_NCCH app_loader(std::move(file), filename); |
| 138 | 138 | ||
| 139 | // Load application and RomFS | 139 | // Load application and RomFS |
| 140 | if (ResultStatus::Success == app_loader.Load()) { | 140 | ResultStatus result = app_loader.Load(); |
| 141 | if (ResultStatus::Success == result) { | ||
| 141 | Service::FS::RegisterArchiveType(Common::make_unique<FileSys::ArchiveFactory_RomFS>(app_loader), Service::FS::ArchiveIdCode::RomFS); | 142 | Service::FS::RegisterArchiveType(Common::make_unique<FileSys::ArchiveFactory_RomFS>(app_loader), Service::FS::ArchiveIdCode::RomFS); |
| 142 | return ResultStatus::Success; | ||
| 143 | } | 143 | } |
| 144 | break; | 144 | return result; |
| 145 | } | 145 | } |
| 146 | 146 | ||
| 147 | // CIA file format... | 147 | // CIA file format... |