summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDuong Nguyen <dnguyen>2008-05-29 21:11:52 +0000
committerDuong Nguyen <dnguyen>2008-05-29 21:11:52 +0000
commit8b0ef9c2e7883e6618617a0ab4b18e2a0e634275 (patch)
tree329c9089e3d7939beca85fa256b93027b5e1a67d
parent9aaf15158e005de49145ad232314a87d8fc21880 (diff)
downloadeclipse.platform.swt-8b0ef9c2e7883e6618617a0ab4b18e2a0e634275.tar.gz
eclipse.platform.swt-8b0ef9c2e7883e6618617a0ab4b18e2a0e634275.tar.xz
eclipse.platform.swt-8b0ef9c2e7883e6618617a0ab4b18e2a0e634275.zip
Bug 234437 - CCombo#setVisible() doesn't check if the popup shell is disposed
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java
index 38a6c0f75e..9714a114c8 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java
@@ -1536,7 +1536,9 @@ public void setVisible (boolean visible) {
* If so then do not continue.
*/
if (isDisposed ()) return;
- if (!visible) popup.setVisible(false);
+ // TEMPORARY CODE
+ if (popup == null || popup.isDisposed ()) return;
+ if (!visible) popup.setVisible (false);
}
/**
* Sets the number of items that are visible in the drop