Merge pull request #891 from RachelBryk/netplay-time

Allow system time to move forward during netplay.
dolphin-emu · Sep 3, 2014 · e2dfa60 · e2dfa60
2 parents 51a5311 + a3cfc98
commit e2dfa60
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/Source/Core/Core/HW/EXI_DeviceIPL.cpp b/Source/Core/Core/HW/EXI_DeviceIPL.cpp
@@ -352,6 +352,8 @@ u32 CEXIIPL::GetGCTime()
 
 		if (0 == ltime)
 			ltime = Common::Timer::GetLocalTimeSinceJan1970();
+		else
+			ltime += CoreTiming::GetTicks() / SystemTimers::GetTicksPerSecond();
 	}
 
 	return ((u32)ltime - cJanuary2000);