From 6690d1bd7259c92b8f545f1fb9b82807aa1688e5 Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Wed, 4 Jan 2017 02:12:18 +0800
Subject: [PATCH] Move logic into updateDisplay.

---
 osu.Game/Overlays/MusicController.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 4825b92dbe..449d588f26 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -235,9 +235,7 @@ protected override void Update()
 
         void preferUnicode_changed(object sender, EventArgs e)
         {
-            if (current != null)
-                updateDisplay(current, TransformDirection.None);
-            //else: we can show something in correspond laguage
+            updateDisplay(current, TransformDirection.None);
         }
 
         private void workingChanged(object sender = null, EventArgs e = null)
@@ -320,7 +318,7 @@ private void updateDisplay(WorkingBeatmap beatmap, TransformDirection direction)
         {
             Task.Run(() =>
             {
-                if (beatmap.Beatmap == null)
+                if (beatmap?.Beatmap == null)
                     //todo: we may need to display some default text here (currently in the constructor).
                     return;