Changeset 13367 in josm for trunk/src/org/openstreetmap
- Timestamp:
- 2018-01-28T23:08:56+01:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
r12987 r13367 208 208 dialog.showDialog(); 209 209 210 lstConflicts.setSelectedIndex(index); 210 if (index < conflicts.size() - 1) { 211 lstConflicts.setSelectedIndex(index); 212 } else { 213 lstConflicts.setSelectedIndex(index - 1); 214 } 211 215 } 212 216 MainApplication.getMap().mapView.repaint(); … … 304 308 int index = lstConflicts.getSelectedIndex(); 305 309 306 return index >= 0 ? conflicts.get(index) : null;310 return index >= 0 && index < conflicts.size() ? conflicts.get(index) : null; 307 311 } 308 312
Note:
See TracChangeset
for help on using the changeset viewer.