Changeset 5174 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2012-04-09T09:15:31+02:00 (12 years ago)

Author:

akks

Message:

should fix #7580 - NPE on Alt-F4 (while in select-moving mode)

File:

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

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

@@ -966 +966 @@
             return tr("Release the mouse button to select the objects in the rectangle.");
         else if (mode == Mode.move) {
-            final boolean canMerge = !getCurrentDataSet().getSelectedNodes().isEmpty();
+            final boolean canMerge = getCurrentDataSet()!=null && !getCurrentDataSet().getSelectedNodes().isEmpty();
             final String mergeHelp = canMerge ? (" " + tr("Ctrl to merge with nearest node.")) : "";
             return tr("Release the mouse button to stop moving.") + mergeHelp;