Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4267 from zhaowenlan1779/movie

Browse source 
movie: Add clock init time to CTM header
This commit is contained in:
Pengfei Zhu 2018-10-05 08:20:33 -05:00 • committed by GitHub
commit 2a90426cb8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 96 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/core/hle/shared_page.cpp
View file

@ -7,6 +7,7 @@
#include "core/core_timing.h"
#include "core/hle/service/ptm/ptm.h"
#include "core/hle/shared_page.h"
#include "core/movie.h"
#include "core/settings.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
@ -14,6 +15,12 @@
namespace SharedPage {
static std::chrono::seconds GetInitTime() {
u64 override_init_time = Core::Movie::GetInstance().GetOverrideInitTime();
if (override_init_time) {
// Override the clock init time with the one in the movie
return std::chrono::seconds(override_init_time);
}
switch (Settings::values.init_clock) {
case Settings::InitClock::SystemTime: {
auto now = std::chrono::system_clock::now();