Fix to ISSUE#4100

RPTools · May 30, 2023 · ff3eaff · ff3eaff
1 parent be6d678
commit ff3eaff
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/main/java/net/rptools/maptool/client/ClientMessageHandler.java b/src/main/java/net/rptools/maptool/client/ClientMessageHandler.java
@@ -341,8 +341,14 @@ private void handle(SetZoneVisibilityMsg msg) {
 
           var zone = MapTool.getCampaign().getZone(zoneGUID);
           zone.setVisible(visible);
-
           ZoneRenderer currentRenderer = MapTool.getFrame().getCurrentZoneRenderer();
+          List<MacroButtonProperties> AllMacroButtons = new ArrayList<>();
+          Collection<GUID> AllTokenIDs = new ArrayList<>();
+          for (Token token : renderer.getZone().getAllTokens()) {
+            AllTokenIDs.add(token.getId());
+          }
+          renderer.getSelectionModel().removeTokensFromSelection(AllTokenIDs);
+          MapTool.getFrame().setCurrentZoneRenderer(null);
           if (!visible
               && !MapTool.getPlayer().isGM()
               && currentRenderer != null