mirror of
https://github.com/ppy/osu.git
synced 2025-03-18 06:27:18 +08:00
Merge pull request #17731 from peppy/fix-highlight-null-ref
This commit is contained in:
commit
2702f7b9f9
@ -534,11 +534,33 @@ namespace osu.Game.Tests.Visual.Online
|
||||
});
|
||||
});
|
||||
|
||||
AddStep("Highlight message and open chat", () =>
|
||||
AddStep("Highlight message", () => chatOverlay.HighlightMessage(message, channel1));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestHighlightWithNullChannel()
|
||||
{
|
||||
Message message = null;
|
||||
|
||||
AddStep("Join channel 1", () => channelManager.JoinChannel(channel1));
|
||||
|
||||
AddStep("Send message in channel 1", () =>
|
||||
{
|
||||
chatOverlay.HighlightMessage(message, channel1);
|
||||
chatOverlay.Show();
|
||||
channel1.AddNewMessages(message = new Message
|
||||
{
|
||||
ChannelId = channel1.Id,
|
||||
Content = "Message to highlight!",
|
||||
Timestamp = DateTimeOffset.Now,
|
||||
Sender = new APIUser
|
||||
{
|
||||
Id = 2,
|
||||
Username = "Someone",
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
AddStep("Set null channel", () => channelManager.CurrentChannel.Value = null);
|
||||
AddStep("Highlight message", () => chatOverlay.HighlightMessage(message, channel1));
|
||||
}
|
||||
|
||||
private void pressChannelHotkey(int number)
|
||||
|
@ -178,8 +178,6 @@ namespace osu.Game.Online.Chat
|
||||
{
|
||||
notificationOverlay.Hide();
|
||||
chatOverlay.HighlightMessage(message, channel);
|
||||
chatOverlay.Show();
|
||||
|
||||
return true;
|
||||
};
|
||||
}
|
||||
|
@ -315,7 +315,7 @@ namespace osu.Game.Overlays
|
||||
{
|
||||
Debug.Assert(channel.Id == message.ChannelId);
|
||||
|
||||
if (currentChannel.Value.Id != channel.Id)
|
||||
if (currentChannel.Value?.Id != channel.Id)
|
||||
{
|
||||
if (!channel.Joined.Value)
|
||||
channel = channelManager.JoinChannel(channel);
|
||||
@ -324,6 +324,8 @@ namespace osu.Game.Overlays
|
||||
}
|
||||
|
||||
channel.HighlightedMessage.Value = message;
|
||||
|
||||
Show();
|
||||
}
|
||||
|
||||
private float startDragChatHeight;
|
||||
|
Loading…
x
Reference in New Issue
Block a user