Merge pull request #17271 from peppy/fix-chat-highlighting-single-or-default

Fix potential crash when highlighting chat messages
This commit is contained in:
Dan Balasescu
2022-03-16 19:31:20 +09:00
committed by GitHub
2 changed files with 3 additions and 3 deletions

View File

@ -30,7 +30,7 @@ namespace osu.Game.Tests.Visual.Online
private int messageIdCounter;
[SetUp]
public void Setup()
public void Setup() => Schedule(() =>
{
if (API is DummyAPIAccess daa)
{
@ -50,7 +50,7 @@ namespace osu.Game.Tests.Visual.Online
testContainer.ChatOverlay.Show();
});
}
});
private bool dummyAPIHandleRequest(APIRequest request)
{

View File

@ -99,7 +99,7 @@ namespace osu.Game.Overlays.Chat
if (highlightedMessage.Value == null)
return;
var chatLine = chatLines.SingleOrDefault(c => c.Message.Equals(highlightedMessage.Value));
var chatLine = chatLines.FirstOrDefault(c => c.Message.Equals(highlightedMessage.Value));
if (chatLine == null)
return;