The-Homebrew-Cloud/Lime3DS
2
0
Fork 0
mirror of https://github.com/Lime3DS/Lime3DS.git synced 2024-11-27 12:04:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5238 from lioncash/return

Browse Source 
kernel/shared_page: Silence missing return warning in GetInitTime()
This commit is contained in:
Ben 2020-04-19 11:31:45 +02:00 committed by GitHub
commit 182aa1e39d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/hle/kernel/shared_page.cpp
View File

@ -5,6 +5,7 @@
#include <chrono>
#include <cstring>
#include "common/archives.h"
#include "common/assert.h"
#include "core/core.h"
#include "core/core_timing.h"
#include "core/hle/kernel/shared_page.h"
@ -30,8 +31,8 @@ template void load_construct_data<iarchive>(iarchive& ar, SharedPage::Handler* t
namespace SharedPage {
static std::chrono::seconds GetInitTime() {
u64 override_init_time = Core::Movie::GetInstance().GetOverrideInitTime();
if (override_init_time) {
const u64 override_init_time = Core::Movie::GetInstance().GetOverrideInitTime();
if (override_init_time != 0) {
// Override the clock init time with the one in the movie
return std::chrono::seconds(override_init_time);
}
@ -48,6 +49,9 @@ static std::chrono::seconds GetInitTime() {
}
case Settings::InitClock::FixedTime:
return std::chrono::seconds(Settings::values.init_time);
default:
UNREACHABLE_MSG("Invalid InitClock value ({})",
static_cast<u32>(Settings::values.init_clock));
}
}