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

Timestamp:

2018-07-07T01:26:53+02:00 (6 years ago)

Author:

Don-vip

Message:

NPE

File:

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

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

@@ -26 +26 @@
 import javax.swing.DefaultListSelectionModel;
 import javax.swing.DropMode;
+import javax.swing.Icon;
 import javax.swing.ImageIcon;
 import javax.swing.JCheckBox;
@@ -836 +837 @@
             fireTableDataChanged();
             int idx = getLayers().indexOf(layer);
-            if (layerList != null) {
-                layerList.setRowHeight(idx, Math.max(16, layer.getIcon().getIconHeight()));
+            Icon icon = layer.getIcon();
+            if (layerList != null && icon != null) {
+                layerList.setRowHeight(idx, Math.max(16, icon.getIconHeight()));
             }
             selectionModel.setSelectionInterval(idx, idx);