From 450aa7753e257f2af65e0b2779ed840bf14c69b2 Mon Sep 17 00:00:00 2001 From: Craig Wisniewski Date: Fri, 12 May 2023 08:55:28 +0930 Subject: [PATCH] fix for html notes being copied to new token dialog text area --- .../client/ui/token/dialog/edit/EditTokenDialog.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/EditTokenDialog.java b/src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/EditTokenDialog.java index 082bbf9f31..eac4b0dcc2 100644 --- a/src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/EditTokenDialog.java +++ b/src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/EditTokenDialog.java @@ -209,11 +209,13 @@ public void bind(final Token token) { // ICON getTokenIconPanel().setImageId(token.getImageAssetId()); - // NOTES - getGMNotesEditor().setText(token.getGMNotes()); + // NOTES, GM NOTES. Due to the way things happen on different gui threads, the type must be set + // before the text + // otherwise the wrong values can get populated when the tab change listener fires. getGMNotesEditor().setTextType(token.getGmNotesType()); - getPlayerNotesEditor().setText(token.getNotes()); + getGMNotesEditor().setText(token.getGMNotes()); getPlayerNotesEditor().setTextType(token.getNotesType()); + getPlayerNotesEditor().setText(token.getNotes()); // TYPE getTypeCombo().setSelectedItem(token.getType());