paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-22 03:59:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE, Debugger: correctly enable run/step buttons if debugger was started with attach. Debugger may be running, even if project is not run-able.

Browse Source 
(cherry picked from commit 3fa54762f2)
This commit is contained in:
Martin 2024-10-22 17:41:04 +02:00
parent 6a0a66229e
commit 2324992bb3
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ide/debugmanager.pas
View File

@ -2339,7 +2339,7 @@ end;
procedure TDebugManager.UpdateButtonsAndMenuItems; procedure TDebugManager.UpdateButtonsAndMenuItems;
var var
DebuggerIsValid: boolean; DebuggerIsValid: boolean;
CanRun: Boolean; CanRun, CanRunOrCont, CanRunOrIsRunning: Boolean;
AvailCommands: TDBGCommands; AvailCommands: TDBGCommands;
CurState: TDBGState; CurState: TDBGState;
begin begin
@ -2350,32 +2350,37 @@ begin
CurState := FDebugger.State; CurState := FDebugger.State;
AvailCommands := GetAvailableCommands; AvailCommands := GetAvailableCommands;
DebuggerIsValid:=(MainIDE.ToolStatus in [itNone, itDebugger]); DebuggerIsValid:=(MainIDE.ToolStatus in [itNone, itDebugger]);
CanRun := CanRunDebugger; CanRun := CanRunDebugger; // This may be wrong, if the project is not run-able, but the debugger was started with attach
CanRunOrCont := CanRun or (CurState in [dsPause, dsInternalPause]);
CanRunOrIsRunning := CanRun or (CurState = dsRun);
with MainIDEBar do begin with MainIDEBar do begin
// For 'run' and 'step' bypass 'idle', so we can set the filename later // For 'run' and 'step' bypass 'idle', so we can set the filename later
// Run // Run
itmRunMenuRun.Enabled := (CanRun and (dcRun in AvailCommands)) or itmRunMenuRun.Enabled := (CanRunOrCont and (dcRun in AvailCommands)) or
((Project1<>nil) and Project1.CompilerOptions.RunWithoutDebug); ((Project1<>nil) and Project1.CompilerOptions.RunWithoutDebug);
itmRunMenuRunWithDebugging.Enabled := CanRun and (dcRun in AvailCommands); itmRunMenuRunWithDebugging.Enabled := CanRun and (dcRun in AvailCommands);
itmRunMenuRunWithDebugging.Visible := (Project1<>nil) and Project1.CompilerOptions.RunWithoutDebug; itmRunMenuRunWithDebugging.Visible := (Project1<>nil) and Project1.CompilerOptions.RunWithoutDebug;
itmRunMenuRunWithoutDebugging.Visible := (Project1<>nil) and (not Project1.CompilerOptions.RunWithoutDebug); itmRunMenuRunWithoutDebugging.Visible := (Project1<>nil) and (not Project1.CompilerOptions.RunWithoutDebug);
// Pause // Pause
itmRunMenuPause.Enabled := CanRun and ((dcPause in AvailCommands) or FAutoContinueTimer.Enabled); itmRunMenuPause.Enabled := CanRunOrIsRunning and ((dcPause in AvailCommands) or FAutoContinueTimer.Enabled);
// Show execution point // Show execution point
itmRunMenuShowExecutionPoint.Enabled := CanRun and (CurState = dsPause); itmRunMenuShowExecutionPoint.Enabled := CanRunOrCont and (CurState = dsPause);
// Step into // Step into
itmRunMenuStepInto.Enabled := CanRun and (dcStepInto in AvailCommands); itmRunMenuStepInto.Enabled := CanRunOrCont and (dcStepInto in AvailCommands);
// Step over // Step over
itmRunMenuStepOver.Enabled := CanRun and (dcStepOver in AvailCommands); itmRunMenuStepOver.Enabled := CanRunOrCont and (dcStepOver in AvailCommands);
// Step out // Step out
itmRunMenuStepOut.Enabled := CanRun and (dcStepOut in AvailCommands) and (CurState = dsPause); itmRunMenuStepOut.Enabled := CanRunOrCont and (dcStepOut in AvailCommands) and (CurState = dsPause);
// Step to cursor // Step to cursor
itmRunMenuStepToCursor.Enabled := CanRun and (dcStepTo in AvailCommands); itmRunMenuStepToCursor.Enabled := CanRunOrCont and (dcStepTo in AvailCommands);
// Run to cursor // Run to cursor
itmRunMenuRunToCursor.Enabled := CanRun and (dcRunTo in AvailCommands); itmRunMenuRunToCursor.Enabled := CanRunOrCont and (dcRunTo in AvailCommands);
// Stop // Stop
itmRunMenuStop.Enabled := (CanRun and (MainIDE.ToolStatus = itDebugger) and itmRunMenuStop.Enabled :=
(CurState in [dsPause, dsInternalPause, dsInit, dsRun, dsError])) or ( (CanRunOrCont or CanRunOrIsRunning) and
(MainIDE.ToolStatus = itDebugger) and
(CurState in [dsPause, dsInternalPause, dsInit, dsRun, dsError])
) or
(MainIDE.ToolStatus = itBuilder); (MainIDE.ToolStatus = itBuilder);
//Attach / Detach //Attach / Detach
@ -2383,9 +2388,9 @@ begin
itmRunMenuDetach.Enabled := DebuggerIsValid and (dcDetach in AvailCommands); itmRunMenuDetach.Enabled := DebuggerIsValid and (dcDetach in AvailCommands);
// Evaluate // Evaluate
itmRunMenuEvaluate.Enabled := CanRun and (dcEvaluate in AvailCommands); itmRunMenuEvaluate.Enabled := CanRunOrCont and (dcEvaluate in AvailCommands);
// Evaluate / modify // Evaluate / modify
SrcEditMenuEvaluateModify.Enabled := CanRun and (dcEvaluate in AvailCommands); SrcEditMenuEvaluateModify.Enabled := CanRunOrCont and (dcEvaluate in AvailCommands);
// Add watch // Add watch
itmRunMenuAddWatch.Enabled := True; // always allow to add a watch itmRunMenuAddWatch.Enabled := True; // always allow to add a watch