Merge remote-tracking branch 'Game4all/master' into truncate-metadata-on-wedge

This commit is contained in:
smoogipoo
2019-10-04 11:21:33 +09:00
89 changed files with 1335 additions and 539 deletions

View File

@ -171,11 +171,6 @@ namespace osu.Game.Screens.Select
Height = FilterControl.HEIGHT,
FilterChanged = c => Carousel.Filter(c),
Background = { Width = 2 },
Exit = () =>
{
if (this.IsCurrentScreen())
this.Exit();
},
},
}
},
@ -490,6 +485,7 @@ namespace osu.Game.Screens.Select
BeatmapDetails.Leaderboard.RefreshScores();
Beatmap.Value.Track.Looping = true;
music?.ResetTrackAdjustments();
if (Beatmap != null && !Beatmap.Value.BeatmapSetInfo.DeletePending)
{