mirror of
https://github.com/ppy/osu.git
synced 2024-09-22 09:27:34 +08:00
Fix disposal issues in ChatOverlay testcase
This commit is contained in:
parent
ce92c8d2eb
commit
119f81b86e
@ -339,13 +339,26 @@ namespace osu.Game.Overlays
|
|||||||
this.channelManager = channelManager;
|
this.channelManager = channelManager;
|
||||||
channelManager.CurrentChannel.ValueChanged += currentChannelChanged;
|
channelManager.CurrentChannel.ValueChanged += currentChannelChanged;
|
||||||
channelManager.JoinedChannels.CollectionChanged += joinedChannelsChanged;
|
channelManager.JoinedChannels.CollectionChanged += joinedChannelsChanged;
|
||||||
channelManager.AvailableChannels.CollectionChanged += (sender, args) => channelSelection.UpdateAvailableChannels(channelManager.AvailableChannels);
|
channelManager.AvailableChannels.CollectionChanged += availableChannelsChanged;
|
||||||
|
|
||||||
//for the case that channelmanager was faster at fetching the channels than our attachment to CollectionChanged.
|
//for the case that channelmanager was faster at fetching the channels than our attachment to CollectionChanged.
|
||||||
channelSelection.UpdateAvailableChannels(channelManager.AvailableChannels);
|
channelSelection.UpdateAvailableChannels(channelManager.AvailableChannels);
|
||||||
joinedChannelsChanged(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, channelManager.JoinedChannels));
|
joinedChannelsChanged(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, channelManager.JoinedChannels));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void availableChannelsChanged(object sender, NotifyCollectionChangedEventArgs e)
|
||||||
|
{
|
||||||
|
channelSelection.UpdateAvailableChannels(channelManager.AvailableChannels);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void Dispose(bool isDisposing)
|
||||||
|
{
|
||||||
|
base.Dispose(isDisposing);
|
||||||
|
channelManager.CurrentChannel.ValueChanged -= currentChannelChanged;
|
||||||
|
channelManager.JoinedChannels.CollectionChanged -= joinedChannelsChanged;
|
||||||
|
channelManager.AvailableChannels.CollectionChanged -= availableChannelsChanged;
|
||||||
|
}
|
||||||
|
|
||||||
private void postMessage(TextBox textbox, bool newText)
|
private void postMessage(TextBox textbox, bool newText)
|
||||||
{
|
{
|
||||||
var text = textbox.Text.Trim();
|
var text = textbox.Text.Trim();
|
||||||
|
Loading…
Reference in New Issue
Block a user