fixes bug that prevented opening the maps and themes more than once

cpesch · Sep 10, 2024 · e241dc0 · e241dc0
1 parent 4ddacd1
commit e241dc0
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/common-gui/src/main/java/slash/navigation/gui/actions/ActionManager.java b/common-gui/src/main/java/slash/navigation/gui/actions/ActionManager.java
@@ -88,6 +88,15 @@ public void register(String actionName, Action action) {
         }
     }
 
+    public void unregister(String actionName) {
+        Action found = actionMap.get(actionName);
+        if (found != null)
+            actionMap.remove(actionName);
+        ProxyAction proxyAction = proxyActionMap.get(actionName);
+        if (proxyAction != null)
+            proxyAction.setDelegate(null);
+    }
+
     public void registerLocal(String globalName, String localName, String actionName) {
         GlobalAction found = (GlobalAction) actionMap.get(globalName);
         if (found == null)
@@ -159,11 +168,12 @@ private ProxyAction(Action delegate) {
 
         public void setDelegate(Action delegate) {
             if (this.delegate != null)
-                delegate.removePropertyChangeListener(this);
+                this.delegate.removePropertyChangeListener(this);
 
             this.delegate = delegate;
 
-            delegate.addPropertyChangeListener(this);
+            if (this.delegate != null)
+                this.delegate.addPropertyChangeListener(this);
         }
 
         public void propertyChange(PropertyChangeEvent evt) {

diff --git a/...converter-opensource/src/main/java/slash/navigation/converter/gui/dialogs/MapsDialog.java b/...converter-opensource/src/main/java/slash/navigation/converter/gui/dialogs/MapsDialog.java
@@ -305,7 +305,14 @@ private MapsforgeMapManager getMapsforgeMapManager() {
     }
 
     private void close() {
-        RouteConverter.getInstance().showMapBorder(null);
+        RouteConverter r = RouteConverter.getInstance();
+        r.showMapBorder(null);
+
+        ActionManager actionManager = r.getContext().getActionManager();
+        actionManager.unregister("display-online-map");
+        actionManager.unregister("display-offline-map");
+        actionManager.unregister("delete-offline-maps");
+        actionManager.unregister("download-maps");
         dispose();
     }
 

diff --git a/...nverter-opensource/src/main/java/slash/navigation/converter/gui/dialogs/ThemesDialog.java b/...nverter-opensource/src/main/java/slash/navigation/converter/gui/dialogs/ThemesDialog.java
@@ -179,6 +179,10 @@ private MapsforgeMapManager getMapsforgeMapManager() {
     }
 
     private void close() {
+        ActionManager actionManager = RouteConverter.getInstance().getContext().getActionManager();
+        actionManager.unregister("apply-theme");
+        actionManager.unregister("download-themes");
+
         dispose();
     }