Changeset 1999 in josm for trunk/src/org

Timestamp:

2009-08-29T10:16:17+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3349: Last 3 few versions of josm report error on start. Neither measurement nor AgPifoJ plugins then work

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

@@ -165 +165 @@
             public void actionPerformed(ActionEvent e) {
                 final JDialog f = new JDialog(JOptionPane.getFrameForComponent(Main.parent),false /* not modal*/);
-                parent.remove(ToggleDialog.this);
+                if (parent != null) {
+                    parent.remove(ToggleDialog.this);
+                }
                 f.getContentPane().add(ToggleDialog.this);
                 f.addWindowListener((winadapter = new WindowAdapter(){
@@ -201 +203 @@
                 titleBar.setVisible(false);
 
-                // doLayout() - workaround
-                parent.setVisible(false);
-                parent.setVisible(true);
+                if (parent != null) {
+                    // doLayout() - workaround
+                    parent.setVisible(false);
+                    parent.setVisible(true);
+                }
             }
         };