RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure a `DrawableChannel` is not attempted to be added after disposal

This commit is contained in:
Dean Herbert 2021-10-04 14:44:16 +09:00
parent 3d71576fbe
commit c6aba3e78b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game/Overlays/ChatOverlay.cs
View File

@ -284,6 +284,10 @@ private void currentChannelChanged(ValueChangedEvent<Channel> e)
if (currentChannel.Value != e.NewValue)
return;
// check once more to ensure the channel hasn't since been removed from the loaded channels like (may have been left by some automated means).
if (loadedChannels.Contains(loaded))
return;
loading.Hide();
currentChannelContainer.Clear(false);
@ -426,7 +430,7 @@ protected override void PopOut()
base.PopOut();
}
private void joinedChannelsChanged(object sender, NotifyCollectionChangedEventArgs args)
private void joinedChannelsChanged(object sender, NotifyCollectionChangedEventArgs args) => Schedule(() =>
{
switch (args.Action)
{
@ -444,10 +448,9 @@ private void joinedChannelsChanged(object sender, NotifyCollectionChangedEventAr
if (loaded != null)
{
loadedChannels.Remove(loaded);
// Because the container is only cleared in the async load callback of a new channel, it is forcefully cleared
// to ensure that the previous channel doesn't get updated after it's disposed
loadedChannels.Remove(loaded);
currentChannelContainer.Remove(loaded);
loaded.Dispose();
}
@ -455,7 +458,7 @@ private void joinedChannelsChanged(object sender, NotifyCollectionChangedEventAr
break;
}
}
});
private void availableChannelsChanged(object sender, NotifyCollectionChangedEventArgs args)
{