sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 15:16:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into safe-screen-lease

Browse Source
This commit is contained in:
Dean Herbert
2020-02-01 02:11:18 +09:00
committed by GitHub
parent a66cdee5e9 9a1df491cd
commit ed368e44ea
16 changed files with 86 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Screens/Select/SongSelect.cs
View File

@ -345,8 +345,8 @@ namespace osu.Game.Screens.Select
selectionChangedDebounce = null;
}
if (performStartAction)
OnStart();
if (performStartAction && OnStart())
Carousel.AllowSelection = false;
}
/// <summary>
@ -500,6 +500,8 @@ namespace osu.Game.Screens.Select
public override void OnResuming(IScreen last)
{
Carousel.AllowSelection = true;
BeatmapDetails.Leaderboard.RefreshScores();
Beatmap.Value.Track.Looping = true;
@ -647,7 +649,6 @@ namespace osu.Game.Screens.Select
decoupledRuleset.ValueChanged += r => Ruleset.Value = r.NewValue;
decoupledRuleset.DisabledChanged += r => Ruleset.Disabled = r;
Beatmap.BindDisabledChanged(disabled => Carousel.AllowSelection = !disabled, true);
Beatmap.BindValueChanged(workingBeatmapChanged);
boundLocalBindables = true;