| commit | 0350ef6e4ca4472fe676dc474b1e749ad0ab8e40 | [log] [tgz] |
|---|---|---|
| author | Andrey Loskutov <loskutov@gmx.de> | Sat Jul 21 17:54:35 2018 +0200 |
| committer | Andrey Loskutov <loskutov@gmx.de> | Sat Jul 21 17:54:35 2018 +0200 |
| tree | 24e2891a69eb305ff182489e224283c39e4644f4 | |
| parent | 7dc4f7d04b1fc206451341d754633e12096fd02c [diff] |
Bug 536677 - Fix the disposal order in ActionSetActionBars Change-Id: I50e2391befd5314141358737786debabd7b7f0e8 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionSetActionBars.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionSetActionBars.java index a7fe1b2..c5f19e6 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionSetActionBars.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActionSetActionBars.java
@@ -79,8 +79,8 @@ */ @Override public void dispose() { - super.dispose(); if (coolItemToolBarMgr == null) { + super.dispose(); return; } // remove the action set's items from its action bar, don't use @@ -113,6 +113,7 @@ toolBarContributionItem = null; coolItemToolBarMgr = null; adjunctContributions = new ArrayList(); + super.dispose(); } /**