From ce07604c74b4a6cc67e4b87266b25b8b9d7223ee Mon Sep 17 00:00:00 2001
From: Malte Dreschert <malte.dreschert@gmail.com>
Date: Mon, 22 Jul 2024 19:44:46 +0200
Subject: [PATCH] Call finalizeCellEditing() before switching tokenTypes to
 make sure that all cell editings are applied before switching the token
 tables. fixes #4650

---
 .../ui/campaignproperties/TokenPropertiesManagementPanel.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/net/rptools/maptool/client/ui/campaignproperties/TokenPropertiesManagementPanel.java b/src/main/java/net/rptools/maptool/client/ui/campaignproperties/TokenPropertiesManagementPanel.java
index 3056d716fc..29b501a8ba 100644
--- a/src/main/java/net/rptools/maptool/client/ui/campaignproperties/TokenPropertiesManagementPanel.java
+++ b/src/main/java/net/rptools/maptool/client/ui/campaignproperties/TokenPropertiesManagementPanel.java
@@ -430,6 +430,9 @@ public void initTypeList() {
                   getTokenTypeList().getSelectedValue() == null
                       ? null
                       : getTokenTypeList().getSelectedValue().toString();
+
+              finalizeCellEditing();
+
               if (propertyType == null) {
                 reset();
                 getPropertyAddButton().setEnabled(false);