From ca383d57de3c430f188fb77f1b6921d777376a64 Mon Sep 17 00:00:00 2001
From: Pawel Piech <pawel.piech@windriver.com>
Date: Tue, 22 Apr 2008 05:09:50 +0000
Subject: [PATCH] [228148] Fixed an NPE exposed by timing changes in services
 initialization.

---
 .../org/eclipse/dd/dsf/debug/ui/actions/DsfCommandRunnable.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/actions/DsfCommandRunnable.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/actions/DsfCommandRunnable.java
index 3dcb478854d..bc566c454b6 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/actions/DsfCommandRunnable.java
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/actions/DsfCommandRunnable.java
@@ -56,7 +56,7 @@ public abstract class DsfCommandRunnable extends DsfRunnable {
         }
         if (getContext() == null) {
             fRequest.setStatus(makeError("Selected object does not support run control.", null));             //$NON-NLS-1$
-        } else if (getRunControl() == null) {
+        } else if (getRunControl() == null || getStepQueueMgr() == null) {
             fRequest.setStatus(makeError("Run Control not available", null)); //$NON-NLS-1$
         } else {
             doExecute();