From 1a1253a4aa66d7bc917322f56d05a61fc627bcc2 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Mon, 16 Dec 2019 03:27:19 +0100
Subject: [PATCH] Add null check to ScrollToAndHighlightMessage

---
 osu.Game/Overlays/Chat/DrawableChannel.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Overlays/Chat/DrawableChannel.cs b/osu.Game/Overlays/Chat/DrawableChannel.cs
index 6813b3464d..1ca65a1da7 100644
--- a/osu.Game/Overlays/Chat/DrawableChannel.cs
+++ b/osu.Game/Overlays/Chat/DrawableChannel.cs
@@ -239,6 +239,9 @@ namespace osu.Game.Overlays.Chat
 
         public void ScrollToAndHighlightMessage(Message message)
         {
+            if (message is null)
+                return;
+
             var chatLine = findChatLine(message);
             scroll.ScrollTo(chatLine);
             chatLine.FlashColour(HighlightColour, 5000, Easing.InExpo);