Fixes Exception that might cause client freeze (FAForever#1576)

Fixes FAForever#1575
mrchris2000 · Apr 15, 2022 · 417ba4a · 417ba4a
1 parent d035111
commit 417ba4a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/main/java/com/faforever/client/fx/JavaFxUtil.java b/src/main/java/com/faforever/client/fx/JavaFxUtil.java
@@ -396,4 +396,12 @@ public static void fixJDK8089296() {
     int newStyle = user32.GetWindowLong(hwnd, GWL_STYLE) | 0x00020000; //WS_MINIMIZEBOX
     user32.SetWindowLong(hwnd, GWL_STYLE, newStyle);
   }
+
+  public static void assureRunOnMainThread(Runnable runnable) {
+    if (Platform.isFxApplicationThread()) {
+      runnable.run();
+    } else {
+      runLater(runnable);
+    }
+  }
 }
diff --git a/src/main/java/com/faforever/client/player/PlayerService.java b/src/main/java/com/faforever/client/player/PlayerService.java
@@ -288,7 +288,7 @@ public void onChatUserCreated(ChatUserCreatedEvent event) {
   }
 
   private void onPlayersInfo(PlayersMessage playersMessage) {
-    playersMessage.getPlayers().forEach(this::onPlayerInfo);
+    playersMessage.getPlayers().forEach(dto -> JavaFxUtil.assureRunOnMainThread(() -> onPlayerInfo(dto)));
   }
 
   private void onFoeList(SocialMessage socialMessage) {