1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 10:47:28 +08:00

Merge branch 'master' into url-parsing-support

This commit is contained in:
Dean Herbert 2018-01-30 18:55:50 +09:00 committed by GitHub
commit a94b4a9ea0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -209,6 +209,8 @@ namespace osu.Game.Screens.Play
{ {
Action = () => Action = () =>
{ {
if (!IsCurrentScreen) return;
//we want to hide the hitrenderer immediately (looks better). //we want to hide the hitrenderer immediately (looks better).
//we may be able to remove this once the mouse cursor trail is improved. //we may be able to remove this once the mouse cursor trail is improved.
RulesetContainer?.Hide(); RulesetContainer?.Hide();
@ -274,6 +276,8 @@ namespace osu.Game.Screens.Play
{ {
onCompletionEvent = Schedule(delegate onCompletionEvent = Schedule(delegate
{ {
if (!IsCurrentScreen) return;
var score = new Score var score = new Score
{ {
Beatmap = Beatmap.Value.BeatmapInfo, Beatmap = Beatmap.Value.BeatmapInfo,