From 9de7e7bc40617f7538e1b738e2e8c20f97a84129 Mon Sep 17 00:00:00 2001
From: MrTheMake <marc.stephan96@hotmail.de>
Date: Thu, 25 May 2017 17:49:47 +0200
Subject: [PATCH] Fixes

---
 osu.Game/Overlays/MusicController.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 1ac189d8e2..f1be55801f 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -264,14 +264,14 @@ namespace osu.Game.Overlays
 
         private void beatmapChanged(WorkingBeatmap beatmap)
         {
+            progressBar.IsEnabled = beatmap != null;
+
+            TransformDirection direction = TransformDirection.None;
+
             if (current != null)
             {
-                progressBar.IsEnabled = beatmap != null;
-
                 bool audioEquals = beatmapBacking.Value?.BeatmapInfo?.AudioEquals(current.BeatmapInfo) ?? false;
 
-                TransformDirection direction;
-
                 if (audioEquals)
                     direction = TransformDirection.None;
                 else if (queuedDirection.HasValue)
@@ -287,12 +287,12 @@ namespace osu.Game.Overlays
 
                     direction = last > next ? TransformDirection.Prev : TransformDirection.Next;
                 }
-
-                updateDisplay(beatmapBacking, direction);
-                queuedDirection = null;
             }
 
             current = beatmapBacking.Value;
+
+            updateDisplay(beatmapBacking, direction);
+            queuedDirection = null;
         }
 
         private ScheduledDelegate pendingBeatmapSwitch;