Merge pull request #4000 from JosJuice/movie-netplay-global

Movie: Don't access g_netplay_initial_gctime directly
dolphin-emu · Jul 11, 2016 · 2de6d07 · 2de6d07
2 parents 7530a2d + 8df4437
commit 2de6d07
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -1223,6 +1223,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<std::mutex> lk(crit_netplay_client);