Changeset 5254 in josm


Ignore:
Timestamp:
2012-05-31T12:10:20+02:00 (12 years ago)
Author:
simon04
Message:

fix #7707 - NPE at keyboard config

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java

    r5070 r5254  
    321321                    if (panel.cbDisable.isSelected()) {
    322322                        sc.setAssignedModifier(-1);
    323                     } else if (panel.tfKey.getSelectedItem().equals("")) {
     323                    } else if (panel.tfKey.getSelectedItem() == null || panel.tfKey.getSelectedItem().equals("")) {
    324324                        sc.setAssignedModifier(KeyEvent.VK_CANCEL);
    325325                    } else {
Note: See TracChangeset for help on using the changeset viewer.