Changeset 13635 in josm

Timestamp:

2018-04-15T18:28:06+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #16191 - NPE

File:

• trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (modified) (1 diff)

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

@@ -547 +547 @@
                 commitCommands(tr("Move tags from ways to relations"));
 
-                List<Way> allWays = new ArrayList<>();
-                for (Multipolygon pol : result.polygons) {
-                    allWays.add(pol.outerWay);
-                    allWays.addAll(pol.innerWays);
-                }
-                if (ds != null) {
+                if (result.polygons != null && ds != null) {
+                    List<Way> allWays = new ArrayList<>();
+                    for (Multipolygon pol : result.polygons) {
+                        allWays.add(pol.outerWay);
+                        allWays.addAll(pol.innerWays);
+                    }
                     ds.setSelected(allWays);
                 }