diff options
| author | Uwe Stieber | 2014-05-27 16:03:43 +0000 |
|---|---|---|
| committer | Uwe Stieber | 2014-05-27 16:03:43 +0000 |
| commit | 55d0239a76ea5c0e7f3e9f1d24fbd737453a97bd (patch) | |
| tree | 4eac029a376e9003a33426a85005b64ecb636cf9 | |
| parent | 008c237bcd5c0a8d589b2f57b108d4b7ae623aae (diff) | |
| download | org.eclipse.tcf-55d0239a76ea5c0e7f3e9f1d24fbd737453a97bd.tar.gz org.eclipse.tcf-55d0239a76ea5c0e7f3e9f1d24fbd737453a97bd.tar.xz org.eclipse.tcf-55d0239a76ea5c0e7f3e9f1d24fbd737453a97bd.zip | |
Target Explorer: Further improvements to the notification popup
| -rw-r--r-- | target_explorer/plugins/org.eclipse.tcf.te.ui.notifications/src/org/eclipse/tcf/te/ui/notifications/internal/popup/AbstractNotificationPopup.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.notifications/src/org/eclipse/tcf/te/ui/notifications/internal/popup/AbstractNotificationPopup.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.notifications/src/org/eclipse/tcf/te/ui/notifications/internal/popup/AbstractNotificationPopup.java index f86db9c92..6e6a1dbbf 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.notifications/src/org/eclipse/tcf/te/ui/notifications/internal/popup/AbstractNotificationPopup.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.notifications/src/org/eclipse/tcf/te/ui/notifications/internal/popup/AbstractNotificationPopup.java @@ -529,9 +529,9 @@ public abstract class AbstractNotificationPopup extends Window { fadeJob = AnimationUtil.fadeOut(getShell(), new IFadeListener() { @Override public void faded(Shell shell, int alpha) { - if (!shell.isDisposed()) { + if (shell != null && !shell.isDisposed()) { if (alpha == 0) { - shell.close(); + close(); } else if (isMouseOver(shell)) { if (fadeJob != null) { fadeJob.cancelAndWait(false); @@ -556,8 +556,8 @@ public abstract class AbstractNotificationPopup extends Window { @Override public boolean close() { - resources.dispose(); - if (lastUsedRegion != null) { + if (resources != null) resources.dispose(); + if (lastUsedRegion != null && !lastUsedRegion.isDisposed()) { lastUsedRegion.dispose(); } if (lastUsedBgImage != null && !lastUsedBgImage.isDisposed()) { |