paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 14:29:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge forgotten go32v2 2.6.0 branch changes back into trunk.

Browse Source 
------------------------------------------------------------------------
r20575 | pierre | 2012-03-22 16:27:57 +0100 (Thu, 22 Mar 2012) | 1 line

 Avoid 'Discard file' question inside reset
------------------------------------------------------------------------
r20581 | pierre | 2012-03-22 18:21:34 +0100 (Thu, 22 Mar 2012) | 1 line

 * Disable iocheck when closing gdb_file
------------------------------------------------------------------------

git-svn-id: trunk@24227 -
This commit is contained in:
pierre 2013-04-12 10:19:38 +00:00
parent b470db3085
commit 9720bd8e82
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ide/fpdebug.pas
View File

@ -1090,11 +1090,16 @@ begin
end; end;
procedure TDebugController.Reset; procedure TDebugController.Reset;
var
old_reset : boolean;
begin begin
inherited Reset; inherited Reset;
{ we need to free the executable { we need to free the executable
if we want to recompile it } if we want to recompile it }
old_reset:=reset_command;
reset_command:=true;
SetExe(''); SetExe('');
reset_command:=old_reset;
NoSwitch:=false; NoSwitch:=false;
{ In case we have something that the compiler touched } { In case we have something that the compiler touched }
If IDEApp.IsRunning then If IDEApp.IsRunning then
@ -3732,6 +3737,9 @@ begin
{$endif def GDBWINDOW} {$endif def GDBWINDOW}
end; end;
const
Invalid_gdb_file_handle: boolean = false;
procedure DoneDebugger; procedure DoneDebugger;
begin begin
@ -3752,7 +3760,20 @@ begin
If Use_gdb_file then If Use_gdb_file then
begin begin
Use_gdb_file:=false; Use_gdb_file:=false;
{$IFOPT I+}
{$I-}
{$DEFINE REENABLE_I}
{$ENDIF}
Close(GDB_file); Close(GDB_file);
if ioresult<>0 then
begin
{ This handle seems to get lost for DJGPP
don't bother too much about this. }
Invalid_gdb_file_handle:=true;
end;
{$IFDEF REENABLE_I}
{$I+}
{$ENDIF}
end; end;
If IDEApp.IsRunning then If IDEApp.IsRunning then
PopStatus; PopStatus;