diff options
| author | JosJuice <josjuice@gmail.com> | 2016-11-03 22:21:28 +0100 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2017-01-04 19:17:51 +0100 |
| commit | c5e731644c01ac7c3cfcc02945693aa7e60dd586 (patch) | |
| tree | 094133300cd3afab004bfd47ee11a4eb5e6d5265 | |
| parent | 6aef0630f74e61d6847fc1f1186056df8bd42651 (diff) | |
Don't use GetEmulatedTime in GCMemcard
GCMemcard is only used outside of the core and has
no real reason to use the core's RTC. GetEmulatedTime
isn't designed to be called when the core isn't running.
Should fix https://bugs.dolphin-emu.org/issues/9871
| -rw-r--r-- | Source/Core/Core/HW/GCMemcard.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/Core/HW/GCMemcard.h b/Source/Core/Core/HW/GCMemcard.h index 69f6c5c85e..35a8942f70 100644 --- a/Source/Core/Core/HW/GCMemcard.h +++ b/Source/Core/Core/HW/GCMemcard.h @@ -11,6 +11,7 @@ #include "Common/CommonTypes.h" #include "Common/NandPaths.h" #include "Common/NonCopyable.h" +#include "Common/Timer.h" #include "Core/HW/EXI_DeviceIPL.h" #include "Core/HW/Sram.h" @@ -131,7 +132,7 @@ struct Header // Offset Size Description memset(this, 0xFF, BLOCK_SIZE); *(u16*)SizeMb = BE16(sizeMb); Encoding = BE16(shift_jis ? 1 : 0); - u64 rand = CEXIIPL::GetEmulatedTime(CEXIIPL::GC_EPOCH); + u64 rand = Common::Timer::GetLocalTimeSinceJan1970() - CEXIIPL::GC_EPOCH; formatTime = Common::swap64(rand); for (int i = 0; i < 12; i++) { |