Changeset 12121 in josm

Timestamp:

2017-05-11T20:40:17+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #14762 - fix NPE (for good?)

File:

• trunk/src/org/openstreetmap/josm/data/osm/FilterMatcher.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/FilterMatcher.java

@@ -225 +225 @@
     private static FilterType test(List<FilterInfo> filters, OsmPrimitive primitive, boolean hidden) {
 
-        if (primitive.isIncomplete() || (Main.map != null && Main.map.mapMode.getPreservedPrimitives().contains(primitive)))
+        if (primitive.isIncomplete() ||
+                (Main.map != null && Main.map.mapMode != null && Main.map.mapMode.getPreservedPrimitives().contains(primitive)))
             return FilterType.NOT_FILTERED;