Merge pull request #1191 from peppy/fix-track-virtual

Fix calling Reset on a TrackVirtual starting the track unexpectedly
ppy · Nov 23, 2017 · fe49ccb · fe49ccb
2 parents d87dab2 + 7779515
commit fe49ccb
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/osu.Framework/Audio/Track/TrackVirtual.cs b/osu.Framework/Audio/Track/TrackVirtual.cs
@@ -21,7 +21,14 @@ public override bool Seek(double seek)
             double current = CurrentTime;
 
             seekOffset = seek;
-            lock (clock) clock.Restart();
+
+            lock (clock)
+            {
+                if (IsRunning)
+                    clock.Restart();
+                else
+                    clock.Reset();
+            }
 
             if (Length > 0 && seekOffset > Length)
                 seekOffset = Length;