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

Merge branch 'master' into key-counter-fixes

Browse Source
This commit is contained in:
Dean Herbert 2019-09-17 22:56:34 +09:00 committed by GitHub
commit ec5f420818
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -173,7 +173,11 @@ namespace osu.Game.Screens.Menu
.Then(5500)
.FadeOut(250)
.ScaleTo(0.9f, 250, Easing.InQuint)
.Finally(d => this.Push(nextScreen));
.Finally(d =>
{
if (nextScreen != null)
this.Push(nextScreen);
});
}
}
}

9
osu.Game/Screens/Play/SongProgressBar.cs
View File

@ -9,6 +9,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.UserInterface;
using osu.Framework.MathUtils;
using osu.Framework.Threading;
namespace osu.Game.Screens.Play
{
@ -121,6 +122,12 @@ namespace osu.Game.Screens.Play
handleBase.X = newX;
}
protected override void OnUserChange(double value) => OnSeek?.Invoke(value);
private ScheduledDelegate scheduledSeek;
protected override void OnUserChange(double value)
{
scheduledSeek?.Cancel();
scheduledSeek = Schedule(() => OnSeek?.Invoke(value));
}
}
}