Changeset 3201 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

Timestamp:

2010-04-23T23:09:20+02:00 (16 years ago)

Author:

stoecker

Message:

fix #4766 (exception), don't display virtual nodes for disabled objects, i18n update

File:

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

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

@@ -490 +490 @@
                         if (!nodesToMerge.isEmpty()) {
                             Command cmd = MergeNodesAction.mergeNodes(Main.main.getEditLayer(),nodesToMerge, targetNode);
-                            Main.main.undoRedo.add(cmd);
+                            if(cmd != null)
+                                Main.main.undoRedo.add(cmd);
                         }
                     }