Changeset 12507 in josm

Timestamp:

2017-07-24T23:58:27+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #15062 - avoid NPE when restarting JOSM

File:

• trunk/src/org/openstreetmap/josm/Main.java (modified) (3 diffs)

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

@@ -1159 +1159 @@
      */
     public static boolean addAndFireMapFrameListener(MapFrameListener listener) {
-        return mainPanel.addAndFireMapFrameListener(listener);
+        return mainPanel != null && mainPanel.addAndFireMapFrameListener(listener);
     }
 
@@ -1170 +1170 @@
      */
     public static boolean addMapFrameListener(MapFrameListener listener) {
-        return mainPanel.addMapFrameListener(listener);
+        return mainPanel != null && mainPanel.addMapFrameListener(listener);
     }
 
@@ -1180 +1180 @@
      */
     public static boolean removeMapFrameListener(MapFrameListener listener) {
-        return mainPanel.removeMapFrameListener(listener);
+        return mainPanel != null && mainPanel.removeMapFrameListener(listener);
     }