From 7c9f30c2885df26f7c9fdec4cef7e546da43af84 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Apr 2017 11:02:37 +0900
Subject: [PATCH] MusicController regression fixes.

---
 osu.Game/Overlays/DragBar.cs         | 4 +++-
 osu.Game/Overlays/MusicController.cs | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/DragBar.cs b/osu.Game/Overlays/DragBar.cs
index dc79b1f094..251aed1ee4 100644
--- a/osu.Game/Overlays/DragBar.cs
+++ b/osu.Game/Overlays/DragBar.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transforms;
 using osu.Framework.Input;
+using OpenTK;
 
 namespace osu.Game.Overlays
 {
@@ -17,7 +18,7 @@ namespace osu.Game.Overlays
         public Action<float> SeekRequested;
         private bool isDragging;
 
-        private bool enabled;
+        private bool enabled = true;
         public bool IsEnabled
         {
             get { return enabled; }
@@ -62,6 +63,7 @@ namespace osu.Game.Overlays
 
         private void updatePosition(float position)
         {
+            position = MathHelper.Clamp(position, 0, 1);
             fill.TransformTo(fill.Width, position, 100, EasingTypes.OutQuint, new TransformWidth());
         }
 
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 9f3eeb47a0..2fc6922dcf 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -237,7 +237,7 @@ namespace osu.Game.Overlays
 
             if (current?.TrackLoaded ?? false)
             {
-                progress.UpdatePosition((float)(current.Track.CurrentTime / current.Track.Length));
+                progress.UpdatePosition(current.Track.Length == 0 ? 0 : (float)(current.Track.CurrentTime / current.Track.Length));
                 playButton.Icon = current.Track.IsRunning ? FontAwesome.fa_pause_circle_o : FontAwesome.fa_play_circle_o;
 
                 if (current.Track.HasCompleted && !current.Track.Looping) next();