From db148d145b4e6d8e5f3484033fbadd867d75fb5b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 Oct 2022 14:47:15 +0900
Subject: [PATCH] Fix incorrect offset logic for beatmaps without a preview
 point specified

---
 osu.Game/Beatmaps/WorkingBeatmap.cs  | 4 +++-
 osu.Game/Screens/Menu/IntroScreen.cs | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index d788ae5862..393c4ba892 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -113,7 +113,7 @@ namespace osu.Game.Beatmaps
         public void PrepareTrackForPreview(bool looping, double offsetFromPreviewPoint = 0)
         {
             Track.Looping = looping;
-            Track.RestartPoint = Metadata.PreviewTime - offsetFromPreviewPoint;
+            Track.RestartPoint = Metadata.PreviewTime;
 
             if (Track.RestartPoint == -1)
             {
@@ -125,6 +125,8 @@ namespace osu.Game.Beatmaps
 
                 Track.RestartPoint = 0.4f * Track.Length;
             }
+
+            Track.RestartPoint += offsetFromPreviewPoint;
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 435c02de96..dcead4a3a8 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -278,7 +278,7 @@ namespace osu.Game.Screens.Menu
 
             if (!UsingThemedIntro)
             {
-                initialBeatmap?.PrepareTrackForPreview(false, 2600);
+                initialBeatmap?.PrepareTrackForPreview(false, -2600);
 
                 drawableTrack.VolumeTo(0);
                 drawableTrack.Restart();