Changeset 12005 in josm for trunk/src/org

Timestamp:

2017-04-26T01:13:37+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #14667 - IOOBE at PreferenceTabbedPane.stateChanged

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java

@@ -462 +462 @@
     }
 
-    private void insertGUITabsForSetting(Icon icon, TabPreferenceSetting tps, int index) {
+    private int insertGUITabsForSetting(Icon icon, TabPreferenceSetting tps, int index) {
         int position = index;
         for (PreferenceTab tab : tabs) {
@@ -469 +469 @@
             }
         }
+        return position - 1;
     }
 
@@ -595 +596 @@
                     Icon icon = getIconAt(index);
                     remove(index);
-                    insertGUITabsForSetting(icon, preferenceSettings, index);
-                    setSelectedIndex(index);
+                    if (index <= insertGUITabsForSetting(icon, preferenceSettings, index)) {
+                        setSelectedIndex(index);
+                    }
                 } catch (SecurityException ex) {
                     Main.error(ex);