Fix DecouplingFramedClock retaining old lastSeekFailed

ppy · Sep 21, 2024 · 41a05e0 · 41a05e0
1 parent 23e6932
commit 41a05e0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/osu.Framework.Tests/Clocks/DecouplingFramedClockTest.cs b/osu.Framework.Tests/Clocks/DecouplingFramedClockTest.cs
@@ -502,6 +502,26 @@ public void TestForwardPlaybackOverLengthBoundary()
             Assert.That(source.IsRunning, Is.False);
         }
 
+        [Test]
+        public void TestPlayDifferentSourceAfterSeekFailure()
+        {
+            decouplingClock.AllowDecoupling = true;
+
+            var firstSource = (TestClockWithRange)source;
+            firstSource.MaxTime = 100;
+
+            decouplingClock.Seek(1000);
+
+            Assert.That(firstSource.IsRunning, Is.False);
+
+            var secondSource = new TestClockWithRange();
+
+            decouplingClock.ChangeSource(secondSource);
+            decouplingClock.Start();
+
+            Assert.That(secondSource.IsRunning, Is.True);
+        }
+
         #endregion
 
         private class TestClockWithRange : TestClock

diff --git a/osu.Framework/Timing/DecouplingFramedClock.cs b/osu.Framework/Timing/DecouplingFramedClock.cs
@@ -155,6 +155,7 @@ public void ChangeSource(IClock? source)
             adjustableSourceClock = adjustableSource;
             currentTime = adjustableSource.CurrentTime;
             shouldBeRunning = adjustableSource.IsRunning;
+            lastSeekFailed = false;
         }
 
         #endregion