h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-19 06:37:45 +08:00
Code Issues Releases Wiki Activity

Fix potential cross-thread operation during chat channel load

Browse Source 
The callbacks are scheduled to the API thread, but hooked up in BDL
load. This causes a potential case of cross-thread collection
enumeration.

I've tested and it seems like the schedule logic should be fine for
short term. Longer term, we probably want to re-think how this works so
background operations aren't performed on the `DrawableChannel` in the
first place (chat shouldn't have an overhead like this when not
visible).

Closes #11231.
This commit is contained in:
Dean Herbert 2020-12-21 16:39:46 +09:00
parent 06d4b323d1
commit d096f2f8f6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Overlays/Chat/DrawableChannel.cs
View File

@ -103,7 +103,7 @@ namespace osu.Game.Overlays.Chat
Colour = colours.ChatBlue.Lighten(0.7f),
};
private void newMessagesArrived(IEnumerable<Message> newMessages)
private void newMessagesArrived(IEnumerable<Message> newMessages) => Schedule(() =>
{
if (newMessages.Min(m => m.Id) < chatLines.Max(c => c.Message.Id))
{
@ -155,9 +155,9 @@ namespace osu.Game.Overlays.Chat
if (shouldScrollToEnd)
scrollToEnd();
}
});
private void pendingMessageResolved(Message existing, Message updated)
private void pendingMessageResolved(Message existing, Message updated) => Schedule(() =>
{
var found = chatLines.LastOrDefault(c => c.Message == existing);
@ -169,12 +169,12 @@ namespace osu.Game.Overlays.Chat
found.Message = updated;
ChatLineFlow.Add(found);
}
}
});
private void messageRemoved(Message removed)
private void messageRemoved(Message removed) => Schedule(() =>
{
chatLines.FirstOrDefault(c => c.Message == removed)?.FadeColour(Color4.Red, 400).FadeOut(600).Expire();
}
});
private IEnumerable<ChatLine> chatLines => ChatLineFlow.Children.OfType<ChatLine>();