1
0
mirror of https://github.com/ppy/osu.git synced 2026-05-22 17:40:01 +08:00

Merge pull request #11984 from peppy/intro-triangles-background-access

Fix potential cross-thread drawable mutation in IntroTriangles
This commit is contained in:
Dan Balasescu
2021-03-08 14:06:26 +09:00
committed by GitHub
Unverified
2 changed files with 5 additions and 2 deletions
+2
View File
@@ -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;
+3 -2
View File
@@ -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());