From 9720bd8e82814a17b3f76f7c46a9cbf662718951 Mon Sep 17 00:00:00 2001
From: pierre <pierre@freepascal.org>
Date: Fri, 12 Apr 2013 10:19:38 +0000
Subject: [PATCH]   Merge forgotten go32v2 2.6.0 branch changes back into
 trunk.
 ------------------------------------------------------------------------
 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 -
---
 ide/fpdebug.pas | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/ide/fpdebug.pas b/ide/fpdebug.pas
index c7f6d2c7e6..a4caf9b9b5 100644
--- a/ide/fpdebug.pas
+++ b/ide/fpdebug.pas
@@ -1090,11 +1090,16 @@ begin
 end;
 
 procedure TDebugController.Reset;
+var
+  old_reset : boolean;
 begin
   inherited Reset;
   { we need to free the executable
     if we want to recompile it }
+  old_reset:=reset_command;
+  reset_command:=true;
   SetExe('');
+  reset_command:=old_reset;
   NoSwitch:=false;
   { In case we have something that the compiler touched }
   If IDEApp.IsRunning then
@@ -3732,6 +3737,9 @@ begin
 {$endif def GDBWINDOW}
 end;
 
+const
+  Invalid_gdb_file_handle: boolean = false;
+
 
 procedure DoneDebugger;
 begin
@@ -3752,7 +3760,20 @@ begin
   If Use_gdb_file then
     begin
       Use_gdb_file:=false;
+{$IFOPT I+}
+  {$I-}
+  {$DEFINE REENABLE_I}
+{$ENDIF}
       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;
   If IDEApp.IsRunning then
     PopStatus;