h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-25 08:22:57 +08:00
Code Issues Releases Wiki Activity

Merge pull request #5808 from peppy/fix-crash-on-close

Browse Source 
Fix crash on closing game
This commit is contained in:
Dan Balasescu 2019-08-23 14:54:19 +09:00 committed by GitHub
commit a4ad70fd76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,7 +138,7 @@ namespace osu.Game.Screens.Menu
private RulesetFlow rulesets; private RulesetFlow rulesets;
private Container rulesetsScale; private Container rulesetsScale;
private Drawable logoContainerSecondary; private Container logoContainerSecondary;
private Drawable lazerLogo; private Drawable lazerLogo;
private GlitchingTriangles triangles; private GlitchingTriangles triangles;
@ -158,7 +158,7 @@ namespace osu.Game.Screens.Menu
{ {
this.game = game; this.game = game;
InternalChildren = new[] InternalChildren = new Drawable[]
{ {
triangles = new GlitchingTriangles triangles = new GlitchingTriangles
{ {
@ -277,7 +277,7 @@ namespace osu.Game.Screens.Menu
{ {
lazerLogo.FadeOut().OnComplete(_ => lazerLogo.FadeOut().OnComplete(_ =>
{ {
lazerLogo.Expire(); logoContainerSecondary.Remove(lazerLogo);
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();