From 8a5e25ce4b6401b86782415351879c64269f9d71 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Oct 2017 18:50:12 +0900
Subject: [PATCH] Simplify waveform construction

---
 osu-framework                       |  2 +-
 osu.Game/Beatmaps/BeatmapManager.cs | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/osu-framework b/osu-framework
index 31754e8fd0..c5235f4ecf 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 31754e8fd0eb840b6aca03ec481b677665999211
+Subproject commit c5235f4ecfe933c04cbb2ee17adc714b9194fe0a
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index ad837b0e5b..a998b3eec3 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -574,15 +574,7 @@ namespace osu.Game.Beatmaps
                 catch { return new TrackVirtual(); }
             }
 
-            protected override Waveform GetWaveform()
-            {
-                try
-                {
-                    var trackData = store.GetStream(getPathForFile(Metadata.AudioFile));
-                    return trackData == null ? new Waveform() : new Waveform(trackData);
-                }
-                catch { return new Waveform(); }
-            }
+            protected override Waveform GetWaveform() => new Waveform(store.GetStream(getPathForFile(Metadata.AudioFile)));
         }
 
         /// <summary>