Author: snjeza Date: 2012-02-16 17:43:35 -0500 (Thu, 16 Feb 2012) New Revision: 38849 Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/ToolTip.java Log: JBIDE-10938 tooltips fail in wizard examples Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/ToolTip.java =================================================================== --- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/ToolTip.java 2012-02-16 21:45:39 UTC (rev 38848) +++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/ToolTip.java 2012-02-16 22:43:35 UTC (rev 38849) @@ -462,12 +462,14 @@ CURRENT_TOOLTIP = shell; control.getShell().addListener(SWT.Deactivate, shellListener); - shell.addDisposeListener(new DisposeListener() { + control.getShell().addDisposeListener(new DisposeListener() { @Override public void widgetDisposed(DisposeEvent e) { - control.getShell().removeListener(SWT.Deactivate, shellListener); - control.getShell().removeDisposeListener(this); + if (control != null && !control.isDisposed() && control.getShell() != null && !control.getShell().isDisposed()) { + control.getShell().removeListener(SWT.Deactivate, shellListener); + control.getShell().removeDisposeListener(this); + } } }); if (popupDelay > 0) {