Changeset 13367 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2018-01-28T23:08:56+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #15332 - IndexOutOfBoundsException in ConflictDialog

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -208 +208 @@
             dialog.showDialog();
 
-            lstConflicts.setSelectedIndex(index);
+            if (index < conflicts.size() - 1) {
+                lstConflicts.setSelectedIndex(index);
+            } else {
+                lstConflicts.setSelectedIndex(index - 1);
+            }
         }
         MainApplication.getMap().mapView.repaint();
@@ -304 +308 @@
         int index = lstConflicts.getSelectedIndex();
 
-        return index >= 0 ? conflicts.get(index) : null;
+        return index >= 0 && index < conflicts.size() ? conflicts.get(index) : null;
     }