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

Timestamp:

2016-08-13T17:08:58+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13337 - NPE

File:

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

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

@@ -10 +10 @@
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
@@ -75 +76 @@
         List<Action> actions;
         if (selectedLayers.size() == 1) {
-            actions = Arrays.asList(selectedLayers.get(0).getMenuEntries());
+            Action[] entries = selectedLayers.get(0).getMenuEntries();
+            actions = entries != null ? Arrays.asList(entries) : Collections.emptyList();
         } else {
             // Very simple algorithm - first selected layer has actions order as in getMenuEntries, actions from other layers go to the end