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

Remove schedule logic (seems unnecessary)

Browse Source
This commit is contained in:
Dean Herbert 2018-06-20 17:41:48 +09:00
parent 39649747aa
commit 96100a2200
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/Multi/Screens/Match/Header.cs
View File

@ -34,7 +34,7 @@ namespace osu.Game.Screens.Multi.Screens.Match
set => cover.BeatmapSet = value; set => cover.BeatmapSet = value;
} }
public Action OnWantsSelectBeatmap; public Action OnRequestSelectBeatmap;
public Header() public Header()
{ {
@ -89,7 +89,7 @@ namespace osu.Game.Screens.Multi.Screens.Match
}, },
}; };
beatmapButton.Action = () => OnWantsSelectBeatmap?.Invoke(); beatmapButton.Action = () => OnRequestSelectBeatmap?.Invoke();
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]

2
osu.Game/Screens/Multi/Screens/Match/Match.cs
View File

@ -50,7 +50,7 @@ namespace osu.Game.Screens.Multi.Screens.Match
}, },
}; };
header.OnWantsSelectBeatmap = () => Push(new MatchSongSelect()); header.OnRequestSelectBeatmap = () => Push(new MatchSongSelect());
beatmapBind.BindTo(room.Beatmap); beatmapBind.BindTo(room.Beatmap);
beatmapBind.BindValueChanged(b => beatmapBind.BindValueChanged(b =>

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

@ -7,12 +7,7 @@ namespace osu.Game.Screens.Select
{ {
protected override bool OnStart() protected override bool OnStart()
{ {
Schedule(() => if (IsCurrentScreen) Exit();
{
// needs to be scheduled else we enter an infinite feedback loop.
if (IsCurrentScreen) Exit();
});
return true; return true;
} }
} }