From 5f9b9631ef38bae53c320a9aa1512250399b1f47 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Dec 2019 14:07:39 +0900
Subject: [PATCH] Move scope/country restrictions into RankingsOverlay

---
 osu.Game/Overlays/Rankings/HeaderTitle.cs | 10 +---------
 osu.Game/Overlays/RankingsOverlay.cs      | 24 +++++++++++++++++++----
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/Rankings/HeaderTitle.cs b/osu.Game/Overlays/Rankings/HeaderTitle.cs
index a1a893fa6b..b08a2a3900 100644
--- a/osu.Game/Overlays/Rankings/HeaderTitle.cs
+++ b/osu.Game/Overlays/Rankings/HeaderTitle.cs
@@ -74,13 +74,7 @@ namespace osu.Game.Overlays.Rankings
             base.LoadComplete();
         }
 
-        private void onScopeChanged(ValueChangedEvent<RankingsScope> scope)
-        {
-            scopeText.Text = scope.NewValue.ToString();
-
-            if (scope.NewValue != RankingsScope.Performance)
-                Country.Value = null;
-        }
+        private void onScopeChanged(ValueChangedEvent<RankingsScope> scope) => scopeText.Text = scope.NewValue.ToString();
 
         private void onCountryChanged(ValueChangedEvent<Country> country)
         {
@@ -90,8 +84,6 @@ namespace osu.Game.Overlays.Rankings
                 return;
             }
 
-            Scope.Value = RankingsScope.Performance;
-
             flag.Country = country.NewValue;
             flag.Show();
         }
diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index 0ec03ebcc9..b989e9473b 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -98,9 +98,25 @@ namespace osu.Game.Overlays
 
         protected override void LoadComplete()
         {
-            country.BindValueChanged(_ => redraw(), true);
-            scope.BindValueChanged(_ => redraw(), true);
-            ruleset.BindValueChanged(_ => redraw(), true);
+            country.BindValueChanged(_ =>
+            {
+                // if a country is requested, force performance scope.
+                if (country.Value != null)
+                    scope.Value = RankingsScope.Performance;
+
+                Scheduler.AddOnce(loadNewContent);
+            }, true);
+            scope.BindValueChanged(_ =>
+            {
+                // country filtering is only valid for performance scope.
+                if (scope.Value != RankingsScope.Performance)
+                    country.Value = null;
+
+                Scheduler.AddOnce(loadNewContent);
+            }, true);
+
+            ruleset.BindValueChanged(_ => Scheduler.AddOnce(loadNewContent), true);
+
             base.LoadComplete();
         }
 
@@ -114,7 +130,7 @@ namespace osu.Game.Overlays
             country.Value = requested;
         }
 
-        private void redraw()
+        private void loadNewContent()
         {
             scrollFlow.ScrollToStart();