Revert "Revert "Bug 361562 [Compatibility] Debug actions in the global debug toolbar are enabled prematurely""

This reverts commit c177e74208e0316544dbfb12a3ec8287462f9eec.

1 files changed, 7 insertions, 1 deletions

diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ActionDelegateHandlerProxy.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ActionDelegateHandlerProxy.java
index 0227a038b51..245fcf0e2b4 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ActionDelegateHandlerProxy.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ActionDelegateHandlerProxy.java
@@ -55,6 +55,7 @@ import org.eclipse.ui.IWorkbenchPartReference;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.IWorkbenchWindowActionDelegate;
 import org.eclipse.ui.internal.WorkbenchPlugin;
+import org.eclipse.ui.internal.util.BundleUtility;
 
 /**
  * <p>
@@ -304,9 +305,14 @@ public final class ActionDelegateHandlerProxy implements ISelectionListener,
 	 */
 	private void updateDelegate(final IAction action,
 			final IEvaluationContext context) {
-		if (action == null || delegate == null) {
+		if (action == null) {
 			return;
 		}
+		if (delegate == null) {
+			if (!BundleUtility.isActive(element.getContributor().getName()) || !loadDelegate()) {
+				return;
+			}
+		}
 
 		if (editorDelegate != null) {
 			final Object activeEditor = context