Changeset 15125 in josm for trunk/src/org/openstreetmap

Timestamp:

2019-05-27T22:03:46+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #17740 - Lock the dataset before we get the selection to avoid disappearing primitives (patch by taylor.smock)

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

@@ -68 +68 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.UndoRedoHandler;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmDataManager;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -234 +235 @@
     public void addTag() {
         changedKey = null;
-        sel = OsmDataManager.getInstance().getInProgressSelection();
-        if (sel == null || sel.isEmpty())
-            return;
-
-        final AddTagsDialog addDialog = getAddTagsDialog();
-
-        addDialog.showDialog();
-
-        addDialog.destroyActions();
-        if (addDialog.getValue() == 1)
-            addDialog.performTagAdding();
-        else
-            addDialog.undoAllTagsAdding();
+        DataSet activeDataSet = OsmDataManager.getInstance().getActiveDataSet();
+        try {
+            activeDataSet.beginUpdate();
+            sel = OsmDataManager.getInstance().getInProgressSelection();
+            if (sel == null || sel.isEmpty())
+                return;
+
+            final AddTagsDialog addDialog = getAddTagsDialog();
+
+            addDialog.showDialog();
+
+            addDialog.destroyActions();
+            if (addDialog.getValue() == 1)
+                addDialog.performTagAdding();
+            else
+                addDialog.undoAllTagsAdding();
+        } finally {
+            activeDataSet.endUpdate();
+        }
     }