diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp index 3ebed8b7ef..70eeee89dd 100644 --- a/Source/Core/Core/Movie.cpp +++ b/Source/Core/Core/Movie.cpp @@ -22,7 +22,7 @@ #include "Core/DSP/DSPCore.h" #include "Core/HW/CPU.h" #include "Core/HW/DVDInterface.h" -#include "Core/HW/EXI_Device.h" +#include "Core/HW/EXI_DeviceIPL.h" #include "Core/HW/ProcessorInterface.h" #include "Core/HW/SI.h" #include "Core/HW/Wiimote.h" @@ -31,7 +31,6 @@ #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h" #include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h" #include "Core/Movie.h" -#include "Core/NetPlayClient.h" #include "Core/NetPlayProto.h" #include "Core/PowerPC/PowerPC.h" #include "Core/State.h" @@ -516,7 +515,7 @@ bool BeginRecordingInput(int controllers) if (NetPlay::IsNetPlayRunning()) { s_bNetPlay = true; - s_recordingStartTime = g_netplay_initial_gctime; + s_recordingStartTime = CEXIIPL::NetPlay_GetGCTime(); } else { diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp index f2f9f3ace6..0ad4b2249d 100644 --- a/Source/Core/Core/NetPlayClient.cpp +++ b/Source/Core/Core/NetPlayClient.cpp @@ -1173,6 +1173,8 @@ bool WiimoteEmu::Wiimote::NetPlay_GetWiimoteData(int wiimote, u8* data, u8 size) // called from ---CPU--- thread // so all players' games get the same time +// +// also called from ---GUI--- thread when starting input recording u64 CEXIIPL::NetPlay_GetGCTime() { std::lock_guard lk(crit_netplay_client);