yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

Merge pull request #1171 from lioncash/true 

core: Remove always true conditionals in Load()
This commit is contained in:
bunnei 2018-08-27 15:41:58 -04:00 committed by GitHub
parent 43a2598e26 8492ec1669
commit 8d86747514
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/core.cpp
View File

@ -135,8 +135,7 @@ System::ResultStatus System::Load(Frontend::EmuWindow& emu_window, const std::st
LOG_CRITICAL(Core, "Failed to determine system mode (Error {})!", LOG_CRITICAL(Core, "Failed to determine system mode (Error {})!",
static_cast<int>(system_mode.second)); 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)}; 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)}; 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)); LOG_CRITICAL(Core, "Failed to load ROM (Error {})!", static_cast<int>(load_result));
System::Shutdown(); System::Shutdown();
if (load_result != Loader::ResultStatus::Success) { return static_cast<ResultStatus>(static_cast<u32>(ResultStatus::ErrorLoader) +
return static_cast<ResultStatus>(static_cast<u32>(ResultStatus::ErrorLoader) + static_cast<u32>(load_result));
static_cast<u32>(load_result));
}
} }
status = ResultStatus::Success; status = ResultStatus::Success;
return status; return status;