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

Merge branch 'master' into net5.0

Browse Source
This commit is contained in:
Dean Herbert 2021-01-15 15:23:41 +09:00 committed by GitHub
commit c3049f431a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
View File

@ -52,6 +52,7 @@ namespace osu.Game.Online.Multiplayer
/// <summary> /// <summary>
/// Whether the <see cref="StatefulMultiplayerClient"/> is currently connected. /// Whether the <see cref="StatefulMultiplayerClient"/> is currently connected.
/// This is NOT thread safe and usage should be scheduled.
/// </summary> /// </summary>
public abstract IBindable<bool> IsConnected { get; } public abstract IBindable<bool> IsConnected { get; }

4
osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
View File

@ -34,8 +34,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
{ {
base.LoadComplete(); base.LoadComplete();
isConnected.BindValueChanged(_ => updateState()); isConnected.BindValueChanged(_ => Scheduler.AddOnce(updateState));
operationInProgress.BindValueChanged(_ => updateState(), true); operationInProgress.BindValueChanged(_ => Scheduler.AddOnce(updateState), true);
} }
private void updateState() => Enabled.Value = isConnected.Value && !operationInProgress.Value; private void updateState() => Enabled.Value = isConnected.Value && !operationInProgress.Value;

4
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
View File

@ -77,14 +77,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
}); });
isConnected = client.IsConnected.GetBoundCopy(); isConnected = client.IsConnected.GetBoundCopy();
isConnected.BindValueChanged(connected => isConnected.BindValueChanged(connected => Schedule(() =>
{ {
if (!connected.NewValue) if (!connected.NewValue)
{ {
// messaging to the user about this disconnect will be provided by the MultiplayerMatchSubScreen. // messaging to the user about this disconnect will be provided by the MultiplayerMatchSubScreen.
failAndBail(); failAndBail();
} }
}, true); }), true);
Debug.Assert(client.Room != null); Debug.Assert(client.Room != null);
} }

6
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
View File

@ -34,10 +34,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
base.LoadComplete(); base.LoadComplete();
isConnected.BindTo(multiplayerClient.IsConnected); isConnected.BindTo(multiplayerClient.IsConnected);
isConnected.BindValueChanged(_ => Schedule(updatePolling)); isConnected.BindValueChanged(_ => Scheduler.AddOnce(updatePolling));
JoinedRoom.BindValueChanged(_ => updatePolling()); JoinedRoom.BindValueChanged(_ => Scheduler.AddOnce(updatePolling), true);
updatePolling();
} }
public override void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null) public override void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)

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

@ -500,7 +500,7 @@ namespace osu.Game.Screens.Select
if (beatmap != null) if (beatmap != null)
{ {
if (beatmap.BeatmapSetInfoID == beatmapNoDebounce?.BeatmapSetInfoID) if (beatmap.BeatmapSetInfoID == previous?.BeatmapInfo.BeatmapSetInfoID)
sampleChangeDifficulty.Play(); sampleChangeDifficulty.Play();
else else
sampleChangeBeatmap.Play(); sampleChangeBeatmap.Play();