From 9fa39cd34e867be4d1258b52f427cfb5eb0cbb6b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 23 Aug 2021 11:11:06 +0300
Subject: [PATCH] Revert ruleset when not applied filters (includes scope
 change)

---
 osu.Game/Overlays/RankingsOverlay.cs | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index 65c9c4d953..9ddcaa589e 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -18,6 +18,8 @@ namespace osu.Game.Overlays
         protected Bindable<RulesetInfo> Ruleset => Header.Ruleset;
         protected Bindable<Country> Country => Header.Country;
 
+        private bool requiresRulesetRevert;
+
         private APIRequest lastRequest;
 
         [Resolved]
@@ -50,6 +52,25 @@ namespace osu.Game.Overlays
             });
         }
 
+        protected override void PopIn()
+        {
+            base.PopIn();
+
+            if (requiresRulesetRevert)
+            {
+                Ruleset.SetDefault();
+                requiresRulesetRevert = false;
+            }
+        }
+
+        protected override void PopOutComplete()
+        {
+            base.PopOutComplete();
+
+            if (Header.Current.Value == default && Country.Value == null)
+                requiresRulesetRevert = true;
+        }
+
         protected override void OnTabChanged(RankingsScope tab)
         {
             // country filtering is only valid for performance scope.