Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreutarass2010-03-25 19:07:59 -0400
committereutarass2010-03-25 19:07:59 -0400
commitb5040dee97cd7dd589da98042148a8b8653371be (patch)
treefb78f2aaab5d09867ea5d9645552a41ce821741e /plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/actions
parenta985f1fd32a727163307cce2811d7246787707e3 (diff)
downloadorg.eclipse.tcf-b5040dee97cd7dd589da98042148a8b8653371be.tar.gz
org.eclipse.tcf-b5040dee97cd7dd589da98042148a8b8653371be.tar.xz
org.eclipse.tcf-b5040dee97cd7dd589da98042148a8b8653371be.zip
TCF Debugger: fixed: UI can lock if keyboard shortcuts F5, F6, or F7 are used for stepping
Diffstat (limited to 'plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/actions')
-rw-r--r--plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/actions/TCFActionStepInto.java7
-rw-r--r--plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/actions/TCFActionStepOut.java7
-rw-r--r--plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/actions/TCFActionStepOver.java7
3 files changed, 15 insertions, 6 deletions
diff --git a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/actions/TCFActionStepInto.java b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/actions/TCFActionStepInto.java
index 42d6cdfca..6d28e1f07 100644
--- a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/actions/TCFActionStepInto.java
+++ b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/actions/TCFActionStepInto.java
@@ -66,10 +66,13 @@ public abstract class TCFActionStepInto extends TCFAction implements IRunControl
return;
}
if (ctx.canResume(src_step ? IRunControl.RM_STEP_INTO_LINE : IRunControl.RM_STEP_INTO)) {
- if (step_cnt > 0) return;
+ if (step_cnt > 0) {
+ exit(null);
+ return;
+ }
ctx.resume(src_step ? IRunControl.RM_STEP_INTO_LINE : IRunControl.RM_STEP_INTO, 1, new IRunControl.DoneCommand() {
public void doneCommand(IToken token, Exception error) {
- exit(error);
+ if (error != null) exit(error);
}
});
step_cnt++;
diff --git a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/actions/TCFActionStepOut.java b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/actions/TCFActionStepOut.java
index 77c6288d0..5c726d59a 100644
--- a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/actions/TCFActionStepOut.java
+++ b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/actions/TCFActionStepOut.java
@@ -60,10 +60,13 @@ public abstract class TCFActionStepOut extends TCFAction implements IRunControl.
return;
}
if (ctx.canResume(IRunControl.RM_STEP_OUT)) {
- if (step_cnt > 0) return;
+ if (step_cnt > 0) {
+ exit(null);
+ return;
+ }
ctx.resume(IRunControl.RM_STEP_OUT, 1, new IRunControl.DoneCommand() {
public void doneCommand(IToken token, Exception error) {
- exit(error);
+ if (error != null) exit(error);
}
});
step_cnt++;
diff --git a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/actions/TCFActionStepOver.java b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/actions/TCFActionStepOver.java
index fdf4aab76..c8ebdeac3 100644
--- a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/actions/TCFActionStepOver.java
+++ b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/actions/TCFActionStepOver.java
@@ -70,10 +70,13 @@ public abstract class TCFActionStepOver extends TCFAction implements IRunControl
return;
}
if (ctx.canResume(src_step ? IRunControl.RM_STEP_OVER_LINE : IRunControl.RM_STEP_OVER)) {
- if (step_cnt > 0) return;
+ if (step_cnt > 0) {
+ exit(null);
+ return;
+ }
ctx.resume(src_step ? IRunControl.RM_STEP_OVER_LINE : IRunControl.RM_STEP_OVER, 1, new IRunControl.DoneCommand() {
public void doneCommand(IToken token, Exception error) {
- exit(error);
+ if (error != null) exit(error);
}
});
step_cnt++;

Back to the top