sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 23:53:51 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11557 from peppy/leave-channel-on-exiting-multiplayer

Browse Source 
Leave the multiplayer channel when leaving multiplayer
This commit is contained in:
Dan Balasescu
2021-01-21 19:35:12 +09:00
committed by GitHub
parent 658370ff38 0fa0e70bff
commit 1ae3f1b9eb
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Online/Chat/ChannelManager.cs
View File

@ -339,7 +339,7 @@ namespace osu.Game.Online.Chat
} }
/// <summary> /// <summary>
/// Joins a channel if it has not already been joined. /// Joins a channel if it has not already been joined. Must be called from the update thread.
/// </summary> /// </summary>
/// <param name="channel">The channel to join.</param> /// <param name="channel">The channel to join.</param>
/// <returns>The joined channel. Note that this may not match the parameter channel as it is a backed object.</returns> /// <returns>The joined channel. Note that this may not match the parameter channel as it is a backed object.</returns>
@ -399,7 +399,11 @@ namespace osu.Game.Online.Chat
return channel; return channel;
} }
public void LeaveChannel(Channel channel) /// <summary>
/// Leave the specified channel. Can be called from any thread.
/// </summary>
/// <param name="channel">The channel to leave.</param>
public void LeaveChannel(Channel channel) => Schedule(() =>
{ {
if (channel == null) return; if (channel == null) return;
@ -413,7 +417,7 @@ namespace osu.Game.Online.Chat
api.Queue(new LeaveChannelRequest(channel)); api.Queue(new LeaveChannelRequest(channel));
channel.Joined.Value = false; channel.Joined.Value = false;
} }
} });
private long lastMessageId; private long lastMessageId;

6
osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
View File

@ -38,5 +38,11 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
Channel.Value = channelManager?.JoinChannel(new Channel { Id = channelId.Value, Type = ChannelType.Multiplayer, Name = $"#lazermp_{roomId.Value}" }); Channel.Value = channelManager?.JoinChannel(new Channel { Id = channelId.Value, Type = ChannelType.Multiplayer, Name = $"#lazermp_{roomId.Value}" });
} }
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
channelManager?.LeaveChannel(Channel.Value);
}
} }
} }