Merge branch 'master' into mirror

JOSM · Oct 4, 2015 · 7f46201 · 7f46201
2 parents c7a59df + 886a5a3
commit 7f46201
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java b/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java
@@ -237,6 +237,10 @@ public void updateEntriesFromDefaults() {
     }
 
     private boolean isSimilar(ImageryInfo iiA, ImageryInfo iiB) {
+        if (iiA == null)
+            return false;
+        if (!iiA.getImageryType().equals(iiB.getImageryType()))
+            return false;
         if (iiA.getId() != null && iiB.getId() != null) return iiA.getId().equals(iiB.getId());
         return isSimilar(iiA.getUrl(), iiB.getUrl());
     }