SM: fix already running simulator is killed when not allowed to use it

on connect

1 files changed, 3 insertions, 1 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/utils/SimulatorUtils.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/utils/SimulatorUtils.java
index 7c31b3f15..d002acf6a 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/utils/SimulatorUtils.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/utils/SimulatorUtils.java
@@ -162,7 +162,7 @@ public final class SimulatorUtils {
 						result.service.useRunning(peerNode, result.settings, new Callback() {
 							@Override
 							protected void internalDone(Object caller, IStatus status) {
-								setUsedRunningSimulator(peerNode, status.isOK());
+								setUsedRunningSimulator(peerNode, true);
 								callback.setResult(new Boolean(status.isOK()));
 								callback.done(caller, status);
 							}
@@ -213,6 +213,7 @@ public final class SimulatorUtils {
 		// Get the associated simulator service
 		final Result result = getSimulatorService(peerNode);
 		if (result != null && result.service != null && !getUsedRunningSimulator(peerNode)) {
+			setUsedRunningSimulator(peerNode, false);
 			// Determine if the simulator is at all running
 			result.service.isRunning(peerNode, result.settings, new Callback() {
 				@Override
@@ -233,6 +234,7 @@ public final class SimulatorUtils {
 				}
 			}, monitor);
 		} else {
+			setUsedRunningSimulator(peerNode, false);
 			callback.done(null, Status.OK_STATUS);
 		}
 	}