diff options
| author | Karsten Thoms | 2018-03-16 10:14:49 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2018-03-16 10:18:03 +0000 |
| commit | 30eb9e2f92f605d3cce85b402b70f8c27c331659 (patch) | |
| tree | 26043541f840fe31d1c30840f0bf16ec2639a540 | |
| parent | bf783d7cd665d0c762e75d067c1d17bba53ca46d (diff) | |
| download | eclipse.platform.swt-30eb9e2f92f605d3cce85b402b70f8c27c331659.tar.gz eclipse.platform.swt-30eb9e2f92f605d3cce85b402b70f8c27c331659.tar.xz eclipse.platform.swt-30eb9e2f92f605d3cce85b402b70f8c27c331659.zip | |
Bug 532522 - fixMenus: add disposal checksI20180316-0730
Change-Id: I99c1113ed373dd125af75d8e84023c875f68cec2
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java | 2 | ||||
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java | 2 |
2 files changed, 2 insertions, 2 deletions
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 7766195916..5f77ce4ffe 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 createHandle (int index) { } 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 3a46570828..c14bd5cab9 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 @@ boolean fillAccel (ACCEL accel) { } void fixMenus (Decorations newParent) { - if (menu != null) menu.fixMenus (newParent); + if (menu != null && !menu.isDisposed() && !newParent.isDisposed()) menu.fixMenus (newParent); } /** |