Changeset 6013 in josm


Ignore:
Timestamp:
2013-06-18T20:50:15+02:00 (7 years ago)
Author:
Don-vip
Message:

fix #8806 - NPE in SelectAction

File:
1 edited

Legend:

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

    r5991 r6013  
    850850        // anything if about to drag the virtual node (i.e. !released) but continue if the
    851851        // cursor is only released above a virtual node by accident (i.e. released). See #7018
    852         if ((shift && ctrl) || (ctrl && !released) || (virtualManager.hasVirtualWaysToBeConstructed() && !released))
     852        if (ds == null || (shift && ctrl) || (ctrl && !released) || (virtualManager.hasVirtualWaysToBeConstructed() && !released))
    853853            return;
    854854
     
    857857            // selected object (it breaks moving of selected groups).
    858858            // Do it later, on mouse release.
    859             shift |= getCurrentDataSet().getSelected().containsAll(prims);
     859            shift |= ds.getSelected().containsAll(prims);
    860860        }
    861861
Note: See TracChangeset for help on using the changeset viewer.