paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2026-01-04 21:10:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

LazDebuggerFp: Fix, Step-over did not stop, if an "auto-continue/none-break" breakpoint was encountered at the end of the step. Fix last commit

Browse Source 
git-svn-id: trunk@59817 -
This commit is contained in:
martin 2018-12-13 16:12:04 +00:00
parent 88767bcd81
commit 4d203a087c
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
components/fpdebug/fpdbgcontroller.pas
View File

@ -493,11 +493,13 @@ end;
procedure TDbgControllerStepOverLineCmd.ResolveEvent(var AnEvent: TFPDEvent; out Handled, Finished: boolean);
var
OrigEvent: TFPDEvent;
EventCopy: TFPDEvent;
begin
OrigEvent := AnEvent;
inherited ResolveEvent(AnEvent, Handled, Finished);
if (AnEvent=deBreakpoint) and not assigned(FController.CurrentProcess.CurrentBreakpoint) then
EventCopy := AnEvent;
inherited ResolveEvent(EventCopy, Handled, Finished);
// todo: check FHiddenBreakpoint.HasLocation();
if (AnEvent=deBreakpoint) and not assigned(FController.CurrentProcess.CurrentBreakpoint)
then
begin
if (FController.FCurrentThread.CompareStepInfo<>dcsiNewLine) or
(not FController.FCurrentThread.IsAtStartOfLine and
@ -509,8 +511,8 @@ begin
Finished:=false;
end;
end;
if not Finished then
AnEvent := OrigEvent;
if Finished then
AnEvent := deFinishedStep;
end;
@ -922,8 +924,14 @@ begin
begin
continue:=false;
// if there is a breakpoint at the stepping end, execute its actions
if assigned(OnHitBreakpointEvent) and Assigned(FCurrentProcess.CurrentBreakpoint) then
if assigned(OnHitBreakpointEvent) and assigned(FCurrentProcess.CurrentBreakpoint) then
OnHitBreakpointEvent(continue, FCurrentProcess.CurrentBreakpoint);
if continue or not assigned(FCurrentProcess.CurrentBreakpoint) then begin
// TODO: dedicated event to set pause and location
// ensure state = dsPause and location is set
continue:=false;
OnHitBreakpointEvent(continue, nil);
end;
// but do not continue
continue:=false;
end;