From 74fc5d5b8cdb3452a69b70c59fa9c8c394103d3d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 Mar 2021 13:29:09 +0900
Subject: [PATCH] Fix potential cross-thread drawable mutation in
 IntroTriangles

---
 osu.Game/Screens/BackgroundScreen.cs    | 2 ++
 osu.Game/Screens/Menu/IntroTriangles.cs | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/BackgroundScreen.cs b/osu.Game/Screens/BackgroundScreen.cs
index 48c5523883..a6fb94b151 100644
--- a/osu.Game/Screens/BackgroundScreen.cs
+++ b/osu.Game/Screens/BackgroundScreen.cs
@@ -13,6 +13,8 @@ namespace osu.Game.Screens
     {
         private readonly bool animateOnEnter;
 
+        public override bool IsPresent => base.IsPresent || Scheduler.HasPendingTasks;
+
         protected BackgroundScreen(bool animateOnEnter = true)
         {
             this.animateOnEnter = animateOnEnter;
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index ffe6882a72..abe6c62461 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -170,7 +170,7 @@ namespace osu.Game.Screens.Menu
 
                 rulesets.Hide();
                 lazerLogo.Hide();
-                background.Hide();
+                background.ApplyToBackground(b => b.Hide());
 
                 using (BeginAbsoluteSequence(0, true))
                 {
@@ -231,7 +231,8 @@ namespace osu.Game.Screens.Menu
                             lazerLogo.Dispose(); // explicit disposal as we are pushing a new screen and the expire may not get run.
 
                             logo.FadeIn();
-                            background.FadeIn();
+
+                            background.ApplyToBackground(b => b.Show());
 
                             game.Add(new GameWideFlash());