Changeset 6800 in josm for trunk/src/org

Timestamp:

2014-02-01T13:05:30+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #9657 - NPE

File:

• trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java

@@ -217 +217 @@
             new WindowGeometry(this).remember(getClass().getName() + ".geometry");
         }
-        if(windowMenuItem != null && !visible) {
-            Main.main.menu.windowMenu.remove(windowMenuItem);
-            windowMenuItem = null;
-        }
-        if(windowMenuItem == null && visible) {
-            windowMenuItem = MainMenu.add(Main.main.menu.windowMenu, focusAction, MainMenu.WINDOW_MENU_GROUP.VOLATILE);
+        if (Main.main != null && Main.main.menu != null && Main.main.menu.windowMenu != null) {
+            if(windowMenuItem != null && !visible) {
+                Main.main.menu.windowMenu.remove(windowMenuItem);
+                windowMenuItem = null;
+            }
+            if(windowMenuItem == null && visible) {
+                windowMenuItem = MainMenu.add(Main.main.menu.windowMenu, focusAction, MainMenu.WINDOW_MENU_GROUP.VOLATILE);
+            }
         }
         super.setVisible(visible);