From 7c7849f189c02855254e73ceb42e40d03150467f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 Sep 2017 21:40:58 +0900
Subject: [PATCH 1/2] Fix icon states being updated incorrectly when being set
 too early

---
 osu.Game/Graphics/SpriteIcon.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Graphics/SpriteIcon.cs b/osu.Game/Graphics/SpriteIcon.cs
index d49814952c..d4f9127d54 100644
--- a/osu.Game/Graphics/SpriteIcon.cs
+++ b/osu.Game/Graphics/SpriteIcon.cs
@@ -57,6 +57,12 @@ namespace osu.Game.Graphics
         private void load(FontStore store)
         {
             this.store = store;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
             updateTexture();
         }
 

From 95dfbb4f0664cb94d4781ef99cd3e39027a82fbf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 Sep 2017 21:41:39 +0900
Subject: [PATCH 2/2] Update framework

---
 osu-framework | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu-framework b/osu-framework
index cb48c7bef8..1b479fb947 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit cb48c7bef8c5909472c70e09059ee6ea5bf6fc8a
+Subproject commit 1b479fb947da193f099df062f696b3a6164da9e0