summaryrefslogtreecommitdiff
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2019-01-10 17:05:21 -0500
committerGravatar GitHub2019-01-10 17:05:21 -0500
commitc9ef8b0af1a5908822ca0f3bb3b2238018a555e8 (patch)
tree157da486e44b5f7083607159e1bb8bb3e4f20842 /src/core/core.cpp
parentMerge pull request #1939 from DarkLordZach/web-applet (diff)
parentsettings: Fix comment structure (diff)
downloadyuzu-c9ef8b0af1a5908822ca0f3bb3b2238018a555e8.tar.gz
yuzu-c9ef8b0af1a5908822ca0f3bb3b2238018a555e8.tar.xz
yuzu-c9ef8b0af1a5908822ca0f3bb3b2238018a555e8.zip
Merge pull request #1959 from DarkLordZach/custom-rtc
settings: Add support for setting the RTC manually
Diffstat (limited to 'src/core/core.cpp')
-rw-r--r--src/core/core.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 715172771..31c590866 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -30,6 +30,7 @@
30#include "core/hle/service/sm/sm.h" 30#include "core/hle/service/sm/sm.h"
31#include "core/loader/loader.h" 31#include "core/loader/loader.h"
32#include "core/perf_stats.h" 32#include "core/perf_stats.h"
33#include "core/settings.h"
33#include "core/telemetry_session.h" 34#include "core/telemetry_session.h"
34#include "frontend/applets/profile_select.h" 35#include "frontend/applets/profile_select.h"
35#include "frontend/applets/software_keyboard.h" 36#include "frontend/applets/software_keyboard.h"
@@ -96,6 +97,11 @@ struct System::Impl {
96 CoreTiming::Init(); 97 CoreTiming::Init();
97 kernel.Initialize(); 98 kernel.Initialize();
98 99
100 const auto current_time = std::chrono::duration_cast<std::chrono::seconds>(
101 std::chrono::system_clock::now().time_since_epoch());
102 Settings::values.custom_rtc_differential =
103 Settings::values.custom_rtc.value_or(current_time) - current_time;
104
99 // Create a default fs if one doesn't already exist. 105 // Create a default fs if one doesn't already exist.
100 if (virtual_filesystem == nullptr) 106 if (virtual_filesystem == nullptr)
101 virtual_filesystem = std::make_shared<FileSys::RealVfsFilesystem>(); 107 virtual_filesystem = std::make_shared<FileSys::RealVfsFilesystem>();