Changeset 5174 in josm


Ignore:
Timestamp:
2012-04-09T09:15:31+02:00 (7 years ago)
Author:
akks
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

    r5161 r5174  
    966966            return tr("Release the mouse button to select the objects in the rectangle.");
    967967        else if (mode == Mode.move) {
    968             final boolean canMerge = !getCurrentDataSet().getSelectedNodes().isEmpty();
     968            final boolean canMerge = getCurrentDataSet()!=null && !getCurrentDataSet().getSelectedNodes().isEmpty();
    969969            final String mergeHelp = canMerge ? (" " + tr("Ctrl to merge with nearest node.")) : "";
    970970            return tr("Release the mouse button to stop moving.") + mergeHelp;
Note: See TracChangeset for help on using the changeset viewer.