From 2a9515f36d66e2d225904de098c33b5e8c25d79e Mon Sep 17 00:00:00 2001
From: Marc Khouzam <marc.khouzam@ericsson.com>
Date: Thu, 17 Dec 2009 19:48:14 +0000
Subject: [PATCH] [298101] Check against null runControl service.

---
 .../internal/ui/disassembly/DisassemblyPart.java   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
index 88b54aa83e9..2d1fa847285 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
@@ -2712,13 +2712,23 @@ public abstract class DisassemblyPart extends WorkbenchPart implements IDisassem
 			return false;
 		}
 		if (session.getExecutor().isInExecutorThread()) {
-			return getRunControl().isSuspended(targetContext);
+			IRunControl runControl = getRunControl();
+			if (runControl == null) {
+				return false;
+			} else {
+				return runControl.isSuspended(targetContext);
+			}
 		}
 		Query<Boolean> query = new Query<Boolean>() {
 			@Override
 			protected void execute(DataRequestMonitor<Boolean> rm) {
 				try {
-					rm.setData(getRunControl().isSuspended(targetContext));
+					IRunControl runControl = getRunControl();
+					if (runControl == null) {
+						rm.setData(false);
+					} else {
+						rm.setData(runControl.isSuspended(targetContext));
+					}
 				} finally {
 					rm.done();
 				}