From 133bcdec7a91cd8a4e85a0cd906a799637b9c170 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Jul 2017 14:39:15 +0900
Subject: [PATCH] Move async loading to a higher level to simplify logic

---
 .../Tests/TestCaseMedalOverlay.cs                    |  4 ++--
 osu.Game/Overlays/MedalOverlay.cs                    | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseMedalOverlay.cs b/osu.Desktop.VisualTests/Tests/TestCaseMedalOverlay.cs
index f069f089bf..1533f2141e 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseMedalOverlay.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseMedalOverlay.cs
@@ -15,12 +15,12 @@ namespace osu.Desktop.VisualTests.Tests
         {
             AddStep(@"display", () =>
             {
-                Add(new MedalOverlay(new Medal
+                LoadComponentAsync(new MedalOverlay(new Medal
                 {
                     Name = @"Animations",
                     InternalName = @"all-intro-doubletime",
                     Description = @"More complex than you think.",
-                }));
+                }), Add);
             });
         }
     }
diff --git a/osu.Game/Overlays/MedalOverlay.cs b/osu.Game/Overlays/MedalOverlay.cs
index 3222d492e9..ccde414d37 100644
--- a/osu.Game/Overlays/MedalOverlay.cs
+++ b/osu.Game/Overlays/MedalOverlay.cs
@@ -155,18 +155,20 @@ namespace osu.Game.Overlays
                 Radius = 50,
             };
 
-            LoadComponentAsync(drawableMedal = new DrawableMedal(medal)
+            disc.Add(drawableMedal = new DrawableMedal(medal)
             {
                 Anchor = Anchor.TopCentre,
                 Origin = Anchor.TopCentre,
                 RelativeSizeAxes = Axes.X,
-            }, m =>
-            {
-                disc.Add(m);
-                Show();
             });
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Show();
+        }
+
         protected override void Update()
         {
             base.Update();