Changeset 15582 in josm for trunk/src/org/openstreetmap/josm/gui/preferences

Timestamp:

2019-12-11T01:40:30+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #18381 - Don't require a restart when a Tagging Preset is added/removed (patch by taylor.smock)

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java

@@ -32 +32 @@
 import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetReader;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
@@ -247 +248 @@
     @Override
     public boolean ok() {
-        boolean restart = Config.getPref().putBoolean("taggingpreset.sortmenu", sortMenu.getSelectedObjects() != null);
-        restart |= sources.finish();
-
-        return restart;
+        if (sources.finish()
+                || Config.getPref().putBoolean("taggingpreset.sortmenu", sortMenu.getSelectedObjects() != null)) {
+            TaggingPresets.destroy();
+            TaggingPresets.initialize();
+        }
+
+        return false;
     }