Merge pull request #1072 from yuriks/GetSystemTick-advance-time

SVC: Advance time when calling GetSystemTick to escape busy-wait loops

1 files changed, 4 insertions, 1 deletions

diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp
index 19f750d727..45d5f3c5d6 100644
--- a/src/core/hle/svc.cpp
+++ b/src/core/hle/svc.cpp
@@ -755,7 +755,10 @@ static void SleepThread(s64 nanoseconds) {
 
 /// This returns the total CPU ticks elapsed since the CPU was powered-on
 static s64 GetSystemTick() {
-    return (s64)CoreTiming::GetTicks();
+    s64 result = CoreTiming::GetTicks();
+    // Advance time to defeat dumb games (like Cubic Ninja) that busy-wait for the frame to end.
+    Core::g_app_core->AddTicks(150); // Measured time between two calls on a 9.2 o3DS with Ninjhax 1.1b
+    return result;
 }
 
 /// Creates a memory block at the specified address with the specified permissions and size