h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 08:07:24 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into skin-editor-multiple-component-settings

Browse Source
This commit is contained in:
Dean Herbert 2022-03-16 22:23:53 +09:00 committed by GitHub
commit 38d15145ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tests/Visual/Online/TestSceneMessageNotifier.cs
View File

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

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

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