Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Northover2006-12-08 16:07:57 -0500
committerSteve Northover2006-12-08 16:07:57 -0500
commit9fb35363fb6351de1a211eece058b60a64dd1d8a (patch)
tree511379a64f6ed7c62975331904c389aaa7e937ba
parent2d1726720c530952002ab2e57064d60b1e12172a (diff)
downloadeclipse.platform.swt-9fb35363fb6351de1a211eece058b60a64dd1d8a.tar.gz
eclipse.platform.swt-9fb35363fb6351de1a211eece058b60a64dd1d8a.tar.xz
eclipse.platform.swt-9fb35363fb6351de1a211eece058b60a64dd1d8a.zip
167219 - NPE in org.eclipse.swt.widgets.Menu._setVisible
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Display.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java2
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Display.java2
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java2
4 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Display.java
index 5ae95488b8..f4339171e4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Display.java
@@ -3418,7 +3418,7 @@ boolean runPopups () {
popups [length] = null;
clearMenuFlags ();
runDeferredEvents ();
- menu._setVisible (true);
+ if (!menu.isDisposed ()) menu._setVisible (true);
clearMenuFlags ();
result = true;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
index c16199827f..a64188f270 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
@@ -3249,7 +3249,7 @@ boolean runPopups () {
System.arraycopy (popups, 1, popups, 0, --length);
popups [length] = null;
runDeferredEvents ();
- menu._setVisible (true);
+ if (!menu.isDisposed ()) menu._setVisible (true);
result = true;
}
popups = null;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Display.java
index 190b9296d2..8054ea9549 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Display.java
@@ -3156,7 +3156,7 @@ boolean runPopups () {
System.arraycopy (popups, 1, popups, 0, --length);
popups [length] = null;
runDeferredEvents ();
- menu._setVisible (true);
+ if (!menu.isDisposed ()) menu._setVisible (true);
result = true;
}
popups = null;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java
index 93ee1ee5bf..cb683f1bea 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java
@@ -3488,7 +3488,7 @@ boolean runPopups () {
System.arraycopy (popups, 1, popups, 0, --length);
popups [length] = null;
runDeferredEvents ();
- menu._setVisible (true);
+ if (!menu.isDisposed ()) menu._setVisible (true);
result = true;
}
popups = null;

Back to the top