diff options
author | bunnei <bunneidev@gmail.com> | 2018-08-27 21:41:58 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-27 21:41:58 +0200 |
commit | 8d867475148d69db53afe734cc39606e3154ad36 (patch) | |
tree | 9ebd46d7bd7caaa07d8e87e8e12b724f1043f375 | |
parent | Merge pull request #1180 from tech4me/languagecode_fix (diff) | |
parent | core: Remove always true conditionals in Load() (diff) | |
download | yuzu-8d867475148d69db53afe734cc39606e3154ad36.tar yuzu-8d867475148d69db53afe734cc39606e3154ad36.tar.gz yuzu-8d867475148d69db53afe734cc39606e3154ad36.tar.bz2 yuzu-8d867475148d69db53afe734cc39606e3154ad36.tar.lz yuzu-8d867475148d69db53afe734cc39606e3154ad36.tar.xz yuzu-8d867475148d69db53afe734cc39606e3154ad36.tar.zst yuzu-8d867475148d69db53afe734cc39606e3154ad36.zip |
-rw-r--r-- | src/core/core.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 28038ff6f..07da4c493 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -135,8 +135,7 @@ System::ResultStatus System::Load(Frontend::EmuWindow& emu_window, const std::st LOG_CRITICAL(Core, "Failed to determine system mode (Error {})!", static_cast<int>(system_mode.second)); - if (system_mode.second != Loader::ResultStatus::Success) - return ResultStatus::ErrorSystemMode; + return ResultStatus::ErrorSystemMode; } ResultStatus init_result{Init(emu_window)}; @@ -148,14 +147,12 @@ System::ResultStatus System::Load(Frontend::EmuWindow& emu_window, const std::st } const Loader::ResultStatus load_result{app_loader->Load(current_process)}; - if (Loader::ResultStatus::Success != load_result) { + if (load_result != Loader::ResultStatus::Success) { LOG_CRITICAL(Core, "Failed to load ROM (Error {})!", static_cast<int>(load_result)); System::Shutdown(); - if (load_result != Loader::ResultStatus::Success) { - return static_cast<ResultStatus>(static_cast<u32>(ResultStatus::ErrorLoader) + - static_cast<u32>(load_result)); - } + return static_cast<ResultStatus>(static_cast<u32>(ResultStatus::ErrorLoader) + + static_cast<u32>(load_result)); } status = ResultStatus::Success; return status; |