Changeset 6739 in josm for trunk


Ignore:
Timestamp:
2014-01-19T20:30:52+01:00 (11 years ago)
Author:
simon04
Message:

Fix NPE when cycling through conflicts with Tab key

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java

    r6524 r6739  
    7373            }
    7474            changeSelection(row, col, false, false);
    75             editCellAt(getSelectedRow(), getSelectedColumn());
    76             getEditorComponent().requestFocusInWindow();
     75            if (editCellAt(getSelectedRow(), getSelectedColumn())) {
     76                getEditorComponent().requestFocusInWindow();
     77            }
    7778        }
    7879    }
    … …  
    104105            }
    105106            changeSelection(row, col, false, false);
    106             editCellAt(getSelectedRow(), getSelectedColumn());
    107             getEditorComponent().requestFocusInWindow();
     107            if (editCellAt(getSelectedRow(), getSelectedColumn())) {
     108                getEditorComponent().requestFocusInWindow();
     109            }
    108110        }
    109111    }
Note: See TracChangeset for help on using the changeset viewer.