From 2bf6b55b19a26add1ad4f3f6e19bc4b553025b95 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Jan 2022 14:53:32 +0900
Subject: [PATCH] Fix failing test due to changed reset page logic

---
 .../UserInterface/PageSelector/PageSelector.cs         | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/PageSelector/PageSelector.cs b/osu.Game/Graphics/UserInterface/PageSelector/PageSelector.cs
index ce74259289..005729580c 100644
--- a/osu.Game/Graphics/UserInterface/PageSelector/PageSelector.cs
+++ b/osu.Game/Graphics/UserInterface/PageSelector/PageSelector.cs
@@ -50,8 +50,14 @@ namespace osu.Game.Graphics.UserInterface.PageSelector
         {
             base.LoadComplete();
 
-            CurrentPage.BindValueChanged(_ => redraw());
-            AvailablePages.BindValueChanged(_ => redraw(), true);
+            CurrentPage.BindValueChanged(_ => Scheduler.AddOnce(redraw));
+            AvailablePages.BindValueChanged(_ =>
+            {
+                CurrentPage.Value = 0;
+
+                // AddOnce as the reset of CurrentPage may also trigger a redraw.
+                Scheduler.AddOnce(redraw);
+            }, true);
         }
 
         private void redraw()