Changeset 11323 in josm for trunk/src

Timestamp:

2016-11-27T02:52:18+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #14016 - NPE

File:

• trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java

@@ -447 +447 @@
         private static final int ICON_SIZE = 24;
         private static final String BASE_ICON = "BASE_ICON";
-        private final transient Image save = ImageProvider.get("save").getImage();
-        private final transient Image upld = ImageProvider.get("upload").getImage();
-        private final transient Image saveDis = new ImageProvider("save").setDisabled(true).get().getImage();
-        private final transient Image upldDis = new ImageProvider("upload").setDisabled(true).get().getImage();
+        private final transient Image save = getImage("save", false);
+        private final transient Image upld = getImage("upload", false);
+        private final transient Image saveDis = getImage("save", true);
+        private final transient Image upldDis = getImage("upload", true);
 
         SaveAndProceedAction() {
             initForReason(Reason.EXIT);
+        }
+
+        Image getImage(String name, boolean disabled) {
+            ImageIcon img = new ImageProvider(name).setDisabled(disabled).get();
+            return img != null ? img.getImage() : null;
         }