From bb9fa52fda51f46e4e0fe39e2be8196ab0dc0fba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 Mar 2024 14:53:05 +0800
Subject: [PATCH] Fix `displayIndex` not being correctly set to `-1` after last
 expiry date

---
 .../Visual/Menus/TestSceneOnlineMenuBanner.cs | 36 ++++++++++++++++++-
 osu.Game/Screens/Menu/OnlineMenuBanner.cs     | 11 +++---
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneOnlineMenuBanner.cs b/osu.Game.Tests/Visual/Menus/TestSceneOnlineMenuBanner.cs
index 2dd08ce306..380085ce04 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneOnlineMenuBanner.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneOnlineMenuBanner.cs
@@ -144,7 +144,41 @@ public void TestMultipleImages()
         }
 
         [Test]
-        public void TestExpiry()
+        public void TestFutureSingle()
+        {
+            AddStep("set image with time constraints", () => onlineMenuBanner.Current.Value = new APIMenuContent
+            {
+                Images = new[]
+                {
+                    new APIMenuImage
+                    {
+                        Image = @"https://assets.ppy.sh/main-menu/project-loved-2@2x.png",
+                        Url = @"https://osu.ppy.sh/home/news/2023-12-21-project-loved-december-2023",
+                        Begins = DateTimeOffset.Now.AddSeconds(2),
+                        Expires = DateTimeOffset.Now.AddSeconds(5),
+                    },
+                },
+            });
+
+            AddUntilStep("wait for no image shown", () => !onlineMenuBanner.ChildrenOfType<OnlineMenuBanner.MenuImage>().Any(i => i.IsPresent));
+
+            AddUntilStep("wait for one image shown", () =>
+            {
+                var images = onlineMenuBanner.ChildrenOfType<OnlineMenuBanner.MenuImage>();
+
+                if (images.Count() != 1)
+                    return false;
+
+                var image = images.Single();
+
+                return image.IsPresent && image.Image.Url == "https://osu.ppy.sh/home/news/2023-12-21-project-loved-december-2023";
+            });
+
+            AddUntilStep("wait for no image shown", () => !onlineMenuBanner.ChildrenOfType<OnlineMenuBanner.MenuImage>().Any(i => i.IsPresent));
+        }
+
+        [Test]
+        public void TestExpiryMultiple()
         {
             AddStep("set multiple images, second expiring soon", () => onlineMenuBanner.Current.Value = new APIMenuContent
             {
diff --git a/osu.Game/Screens/Menu/OnlineMenuBanner.cs b/osu.Game/Screens/Menu/OnlineMenuBanner.cs
index 55ceb84d7b..37bec7aa63 100644
--- a/osu.Game/Screens/Menu/OnlineMenuBanner.cs
+++ b/osu.Game/Screens/Menu/OnlineMenuBanner.cs
@@ -127,14 +127,15 @@ private void showNext()
             {
                 int previousIndex = displayIndex;
 
-                if (displayIndex == -1)
-                    displayIndex = 0;
-
                 // To handle expiration simply, arrange all images in best-next order.
                 // Fade in the first valid one, then handle fading out the last if required.
                 var currentRotation = content
-                                      .Skip(displayIndex + 1)
-                                      .Concat(content.Take(displayIndex + 1));
+                                      .Skip(Math.Max(0, previousIndex) + 1)
+                                      .Concat(content.Take(Math.Max(0, previousIndex) + 1));
+
+                // After the loop, displayIndex will be the new valid index or -1 if
+                // none valid.
+                displayIndex = -1;
 
                 foreach (var image in currentRotation)
                 {