summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarolyn MacLeod <Carolyn_MacLeod@ca.ibm.com>2012-11-06 10:50:49 -0500
committerCarolyn MacLeod <Carolyn_MacLeod@ca.ibm.com>2012-11-06 10:50:49 -0500
commit252a9be34fefb5f44adadae747e851b38287eadb (patch)
tree22f2af92bb48c25217eed776deb68b7710f86708
parent178cb4e2bfde0fd9413f9dbcf7daef2ded96190a (diff)
downloadeclipse.platform.swt-252a9be34fefb5f44adadae747e851b38287eadb.tar.gz
eclipse.platform.swt-252a9be34fefb5f44adadae747e851b38287eadb.tar.xz
eclipse.platform.swt-252a9be34fefb5f44adadae747e851b38287eadb.zip
Bug 250948 - NPE in CCombo.isDropped
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java2
1 files changed, 1 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 a110b6df36..04c0528d5d 100644
--- 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
@@ -1054,7 +1054,7 @@ void initAccessible() {
});
}
boolean isDropped () {
- return popup != null && popup.getVisible ();
+ return !isDisposed() && popup.getVisible ();
}
public boolean isFocusControl () {
checkWidget();