From 8492ec166970ed148f6577dfa3e672f0357095db Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 24 Aug 2018 02:48:28 -0400 Subject: core: Remove always true conditionals in Load() These conditions are always true, since the outer conditional already checks for these conditions. --- src/core/core.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/core') 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(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(load_result)); System::Shutdown(); - if (load_result != Loader::ResultStatus::Success) { - return static_cast(static_cast(ResultStatus::ErrorLoader) + - static_cast(load_result)); - } + return static_cast(static_cast(ResultStatus::ErrorLoader) + + static_cast(load_result)); } status = ResultStatus::Success; return status; -- cgit v1.2.3