From 2abcdbf4dfb7a5bc07dc02cacfdc5ab1bedd6201 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 17 Mar 2017 14:56:12 +0900
Subject: [PATCH] Fix potentially incorrect states being applied to panels on
 first display.

---
 osu.Game/Beatmaps/Drawables/BeatmapPanel.cs | 2 ++
 osu.Game/Beatmaps/Drawables/Panel.cs        | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/osu.Game/Beatmaps/Drawables/BeatmapPanel.cs b/osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
index 191cb405d0..f04d35efc3 100644
--- a/osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
+++ b/osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
@@ -59,6 +59,8 @@ protected override bool OnClick(InputState state)
 
         protected override void ApplyState(PanelSelectedState last = PanelSelectedState.Hidden)
         {
+            if (!IsLoaded) return;
+
             base.ApplyState(last);
 
             if (last == PanelSelectedState.Hidden && State != last)
diff --git a/osu.Game/Beatmaps/Drawables/Panel.cs b/osu.Game/Beatmaps/Drawables/Panel.cs
index a15d0c22f0..fba586bc05 100644
--- a/osu.Game/Beatmaps/Drawables/Panel.cs
+++ b/osu.Game/Beatmaps/Drawables/Panel.cs
@@ -51,6 +51,8 @@ protected override void LoadComplete()
 
         protected virtual void ApplyState(PanelSelectedState last = PanelSelectedState.Hidden)
         {
+            if (!IsLoaded) return;
+
             switch (state)
             {
                 case PanelSelectedState.Hidden: