Merge pull request ppy#7872 from EVAST9919/spotlights-fix

Fix possible error in SpotlightsLayout after it's disposal
AllAxis · Feb 17, 2020 · 0c1822b · 0c1822b
2 parents 582d968 + c78534d
commit 0c1822b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/osu.Game/Overlays/Rankings/SpotlightsLayout.cs b/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
@@ -89,7 +89,7 @@ protected override void LoadComplete()
         private void getSpotlights()
         {
             spotlightsRequest = new GetSpotlightsRequest();
-            spotlightsRequest.Success += response => selector.Spotlights = response.Spotlights;
+            spotlightsRequest.Success += response => Schedule(() => selector.Spotlights = response.Spotlights);
             api.Queue(spotlightsRequest);
         }
 
@@ -151,11 +151,11 @@ private void onSuccess(GetSpotlightRankingsResponse response)
 
         protected override void Dispose(bool isDisposing)
         {
-            base.Dispose(isDisposing);
-
             spotlightsRequest?.Cancel();
             getRankingsRequest?.Cancel();
             cancellationToken?.Cancel();
+
+            base.Dispose(isDisposing);
         }
     }
 }