From f9cceb2767c6e7078cefe552c2936137ea7ceb71 Mon Sep 17 00:00:00 2001
From: Sheikah45 <Sheikah450@gmail.com>
Date: Thu, 30 Nov 2023 18:36:54 -0500
Subject: [PATCH] Scroll to bottom of chat

---
 .idea/vcs.xml                                            | 9 +++++++++
 .../faforever/client/chat/AbstractChatTabController.java | 1 +
 2 files changed, 10 insertions(+)

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c8d171ba81..5564846408 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -6,6 +6,15 @@
       <inspection_tool class="SubjectLimit" enabled="true" level="WARNING" enabled_by_default="true" />
     </profile>
   </component>
+  <component name="GitSharedSettings">
+    <option name="FORCE_PUSH_PROHIBITED_PATTERNS">
+      <list>
+        <option value="master" />
+        <option value="main" />
+        <option value="develop" />
+      </list>
+    </option>
+  </component>
   <component name="GithubSharedProjectSettings">
     <option name="branchProtectionPatterns">
       <list>
diff --git a/src/main/java/com/faforever/client/chat/AbstractChatTabController.java b/src/main/java/com/faforever/client/chat/AbstractChatTabController.java
index 8e0b43f6f8..0978dbb748 100644
--- a/src/main/java/com/faforever/client/chat/AbstractChatTabController.java
+++ b/src/main/java/com/faforever/client/chat/AbstractChatTabController.java
@@ -340,6 +340,7 @@ private void sendWaitingMessagesIfLoaded(State newValue) {
     synchronized (waitingMessages) {
       waitingMessages.forEach(AbstractChatTabController.this::addMessage);
       waitingMessages.clear();
+      scrollToBottomIfDesired();
       isChatReady = true;
     }
   }