Changeset 6061 in josm


Ignore:
Timestamp:
2013-07-10T20:56:22+02:00 (8 years ago)
Author:
Don-vip
Message:

see #8865 - fix NPE in core

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

    r5970 r6061  
    9696
    9797    /** The action to toggle this dialog */
    98     protected ToggleDialogAction toggleAction;
     98    protected final ToggleDialogAction toggleAction;
    9999    protected String preferencePrefix;
    100100    final protected String name;
     
    242242            if (isShowing) {
    243243                hideDialog();
    244                 dialogsPanel.reconstruct(Action.ELEMENT_SHRINKS, null);
     244                if (dialogsPanel != null) {
     245                    dialogsPanel.reconstruct(Action.ELEMENT_SHRINKS, null);
     246                }
    245247                hideNotify();
    246248            } else {
     
    249251                    expand();
    250252                }
    251                 if (isDocked) {
     253                if (isDocked && dialogsPanel != null) {
    252254                    dialogsPanel.reconstruct(Action.INVISIBLE_TO_DEFAULT, ToggleDialog.this);
    253255                }
Note: See TracChangeset for help on using the changeset viewer.