Changeset 9276 in josm

Timestamp:

2016-01-03T14:19:01+01:00 (9 years ago)

Author:

simon04

Message:

fix #12283 - Download notes in current view: fix NPE

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (1 diff)
• actions/DownloadNotesInViewAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/Main.java

@@ -144 +144 @@
      */
     public static boolean isDisplayingMapView() {
-        if (map == null) return false;
-        if (map.mapView == null) return false;
-        return true;
+        return map != null && map.mapView != null;
     }
 

trunk/src/org/openstreetmap/josm/actions/DownloadNotesInViewAction.java

@@ -43 +43 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(Main.map != null && Main.map.mapView != null && !Main.isOffline(OnlineResource.OSM_API));
+        setEnabled(Main.isDisplayingMapView()
+                && Main.map.mapView.getActiveLayer() != null
+                && !Main.isOffline(OnlineResource.OSM_API));
     }
 }