summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-08-24 08:48:28 +0200
committerLioncash <mathew1800@gmail.com>2018-08-24 08:48:30 +0200
commit8492ec166970ed148f6577dfa3e672f0357095db (patch)
tree36b93f208953f281ea47d10b22a9920b4fa4dcbc /src/core
parentPort #4013 from Citra: "Init logging sooner so we dont miss some logs on startup" (#1142) (diff)
downloadyuzu-8492ec166970ed148f6577dfa3e672f0357095db.tar
yuzu-8492ec166970ed148f6577dfa3e672f0357095db.tar.gz
yuzu-8492ec166970ed148f6577dfa3e672f0357095db.tar.bz2
yuzu-8492ec166970ed148f6577dfa3e672f0357095db.tar.lz
yuzu-8492ec166970ed148f6577dfa3e672f0357095db.tar.xz
yuzu-8492ec166970ed148f6577dfa3e672f0357095db.tar.zst
yuzu-8492ec166970ed148f6577dfa3e672f0357095db.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/core.cpp11
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;