Merge pull request #5269 from kwvanderlinde/bugfix/5268-deadlock

Fix deadlock in 1.16.0.rc-1
RPTools · Feb 18, 2025 · 4164d8a · 4164d8a
2 parents 4f2f47c + 576475d
commit 4164d8a
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/main/java/net/rptools/maptool/client/MapTool.java b/src/main/java/net/rptools/maptool/client/MapTool.java
@@ -1024,11 +1024,14 @@ public static void startServer(
     connections.serverSide().open();
     server.addLocalConnection(connections.serverSide(), player);
     // Update the client, including running onCampaignLoad.
-    setCampaign(
-        client.getCampaign(),
-        Optional.ofNullable(clientFrame.getCurrentZoneRenderer())
-            .map(zr -> zr.getZone().getId())
-            .orElse(null));
+    EventQueue.invokeLater(
+        () -> {
+          setCampaign(
+              client.getCampaign(),
+              Optional.ofNullable(clientFrame.getCurrentZoneRenderer())
+                  .map(zr -> zr.getZone().getId())
+                  .orElse(null));
+        });
   }
 
   public static ThumbnailManager getThumbnailManager() {