Changeset 10280 in josm for trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

Timestamp:

2016-05-25T08:58:13+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #12874 - NPE

File:

• trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -159 +159 @@
     public void setRecentRelation(Relation relation) {
         recentRelations.put(relation, null);
-        Main.map.relationListDialog.enableRecentRelations();
+        if (Main.map != null && Main.map.relationListDialog != null) {
+            Main.map.relationListDialog.enableRecentRelations();
+        }
     }
 
@@ -169 +171 @@
     public void removeRecentRelation(Relation relation) {
         recentRelations.remove(relation);
-        Main.map.relationListDialog.enableRecentRelations();
+        if (Main.map != null && Main.map.relationListDialog != null) {
+            Main.map.relationListDialog.enableRecentRelations();
+        }
     }