| commit | 30eb9e2f92f605d3cce85b402b70f8c27c331659 | [log] [tgz] |
|---|---|---|
| author | Karsten Thoms <karsten.thoms@itemis.de> | Fri Mar 16 11:14:49 2018 +0100 |
| committer | Alexander Kurtakov <akurtako@redhat.com> | Fri Mar 16 06:18:03 2018 -0400 |
| tree | 26043541f840fe31d1c30840f0bf16ec2639a540 | |
| parent | bf783d7cd665d0c762e75d067c1d17bba53ca46d [diff] |
Bug 532522 - fixMenus: add disposal checks Change-Id: I99c1113ed373dd125af75d8e84023c875f68cec2 Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java index 7766195..5f77ce4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java
@@ -402,7 +402,7 @@ } void fixMenus (Decorations newParent) { - if (menu != null) menu.fixMenus (newParent); + if (menu != null && !menu.isDisposed() && !newParent.isDisposed()) menu.fixMenus (newParent); } /**
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java index 3a46570..c14bd5c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java
@@ -295,7 +295,7 @@ } void fixMenus (Decorations newParent) { - if (menu != null) menu.fixMenus (newParent); + if (menu != null && !menu.isDisposed() && !newParent.isDisposed()) menu.fixMenus (newParent); } /**