Changeset 4152 in josm

Timestamp:

Jun 19, 2011 11:55:40 PM (2 years ago)

Author:

stoecker

Message:

fix #6217 - Corrupted data after merging nodes

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -636 +636 @@
             if (!target.isEmpty()) {
                 Collection<Node> nodesToMerge = new LinkedList<Node>(affectedNodes);
-                nodesToMerge.add(target.iterator().next());
-
-                Command cmd = MergeNodesAction.mergeNodes(Main.main.getEditLayer(), nodesToMerge, target.iterator().next());
+                Node t = target.iterator().next();
+                nodesToMerge.add(t);
+                Command cmd = MergeNodesAction.mergeNodes(Main.main.getEditLayer(), nodesToMerge, t);
                 if (cmd != null) {
                     Main.main.undoRedo.add(cmd);
+                    getCurrentDataSet().setSelected(t);
                 }
             }