sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-30 09:57:21 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
commit ef88cbd9f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Screens/BackgroundScreen.cs
View File

@ -13,6 +13,8 @@ namespace osu.Game.Screens
{ {
private readonly bool animateOnEnter; private readonly bool animateOnEnter;
public override bool IsPresent => base.IsPresent || Scheduler.HasPendingTasks;
protected BackgroundScreen(bool animateOnEnter = true) protected BackgroundScreen(bool animateOnEnter = true)
{ {
this.animateOnEnter = animateOnEnter; this.animateOnEnter = animateOnEnter;

5
osu.Game/Screens/Menu/IntroTriangles.cs
View File

@ -170,7 +170,7 @@ namespace osu.Game.Screens.Menu
rulesets.Hide(); rulesets.Hide();
lazerLogo.Hide(); lazerLogo.Hide();
background.Hide(); background.ApplyToBackground(b => b.Hide());
using (BeginAbsoluteSequence(0, true)) 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. lazerLogo.Dispose(); // explicit disposal as we are pushing a new screen and the expire may not get run.
logo.FadeIn(); logo.FadeIn();
background.FadeIn();
background.ApplyToBackground(b => b.Show());
game.Add(new GameWideFlash()); game.Add(new GameWideFlash());