Fix gameplay restart in HUD editor mode potentially skipping too far …

…ahead
osudroid · Mar 1, 2025 · a663907 · a663907
1 parent 78bb447
commit a663907
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/ru/nsu/ccfit/zuev/osu/game/GameScene.java b/src/ru/nsu/ccfit/zuev/osu/game/GameScene.java
@@ -1635,9 +1635,12 @@ public void skip(boolean force)
         }
 
         ResourceManager.getInstance().getSound("menuhit").play();
-        float difference = skipTime - elapsedTime;
 
-        elapsedTime = skipTime;
+        float difference = Math.max(0, skipTime - elapsedTime);
+
+        // Skip time may be negative in forced skips, which will cause desynchronization between game time and
+        // audio time, so we cap it at 0.
+        elapsedTime = Math.max(0, skipTime);
         int seekTime = (int) Math.ceil(elapsedTime * 1000);
         int videoSeekTime = seekTime - (int) (videoOffset * 1000);