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

Timestamp:

2016-02-28T00:55:12+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #12568 - NPE

File:

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

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -244 +244 @@
         if (nativeScaleLayer != null) {
             ScaleList scaleList = nativeScaleLayer.getNativeScales();
-            return scaleList.getSnapScale(scale, PROP_ZOOM_RATIO.get(), floor).getScale();
+            Scale snapscale = scaleList.getSnapScale(scale, PROP_ZOOM_RATIO.get(), floor);
+            return snapscale != null ? snapscale.getScale() : scale;
         } else {
             return scale;