Changeset 175 for trunk/Forms

Timestamp:

Aug 21, 2024, 10:00:57 AM (4 months ago)

Author:

chronos

Message:

• Fixed: Error on showing execution point in not paused state.

File:

• trunk/Forms/FormMain.pas (modified) (2 diffs)

trunk/Forms/FormMain.pas

@@ -374 +374 @@
     AProgramRunToCursor.Enabled := CanDebug and (tcRunToCursor in CurrentTarget.Capabilities);
     AProgramStepOver.Enabled := CanDebug and (tcStepOver in CurrentTarget.Capabilities);
-    AProgramShowExecutionPoint.Enabled := CanDebug and (tcPause in CurrentTarget.Capabilities);
+    AProgramShowExecutionPoint.Enabled := CanDebug and (tcPause in CurrentTarget.Capabilities) and
+      (CurrentTarget.State = rsPaused);
     AShowSourcePosition.Enabled := CurrentTarget.Compiled;
     AShowTargetPosition.Enabled := CurrentTarget.Compiled;
@@ -689 +690 @@
   DebugStep := Core.Core.CurrentTarget.DebugSteps.SearchByProgramPos(
     Core.Core.CurrentTarget.ExecutionPosition);
-  FormSourceCode.SynEditSource.SelStart := DebugStep.SourcePosition + 1;
-  FormTargetCode.SynEditTarget.SelStart := DebugStep.TargetPosition + 1;
-  if PageControlMain.TabIndex = 0 then FormSourceCode.SynEditSource.SetFocus;
-  if PageControlMain.TabIndex = 1 then FormTargetCode.SynEditTarget.SetFocus;
+  if Assigned(DebugStep) then begin
+    FormSourceCode.SynEditSource.SelStart := DebugStep.SourcePosition + 1;
+    FormTargetCode.SynEditTarget.SelStart := DebugStep.TargetPosition + 1;
+    if PageControlMain.TabIndex = 0 then FormSourceCode.SynEditSource.SetFocus;
+    if PageControlMain.TabIndex = 1 then FormTargetCode.SynEditTarget.SetFocus;
+  end;
 end;