* try to fix recompilation on changes problems

ide/fpcompil.pas

@@ -118,6 +118,7 @@ const
     CompilerMessageWindow : PCompilerMessageWindow  = nil;
     CompilerStatusDialog  : PCompilerStatusDialog = nil;
     CompileStamp          : longint = 0;
+    RestartingDebugger    : boolean = false;
 
 procedure DoCompile(Mode: TCompileMode);
 function  NeedRecompile(Mode :TCompileMode; verbose : boolean): boolean;
@@ -792,10 +793,12 @@ begin
         FileName:=PrimaryFileMain
       else if assigned(P) then
         begin
-            FileName:=P^.Editor^.FileName;
-            if FileName='' then
+          FileName:=P^.Editor^.FileName;
+          if FileName='' then
+            begin
               P^.Editor^.SaveAsk(true);
-            FileName:=P^.Editor^.FileName;
+              FileName:=P^.Editor^.FileName;
+            end;
         end
       else
         FileName:='';
@@ -948,7 +951,6 @@ begin
             MustRestartDebugger:=true;
           end;
 {$endif NODEBUG}
-      LastCompileTime := cardinal(Now);
       FpIntF.Compile(FileName,SwitchesPath);
       SetStatus('Finished compiling...');
     end
@@ -1049,7 +1051,10 @@ begin
 { Set end status }
   if not (CompilationPhase in [cpAborted,cpFailed]) then
     if (status.errorCount=0) then
-      CompilationPhase:=cpDone
+      begin
+        CompilationPhase:=cpDone;
+        LastCompileTime := cardinal(Now);
+      end
     else
       CompilationPhase:=cpFailed;
 { Show end status }
@@ -1060,12 +1065,15 @@ begin
       CompilerStatusDialog^.Update;
       CompilerStatusDialog^.ReDraw;
       CompilerStatusDialog^.SetState(sfModal,false);
-      if ((CompilationPhase in[cpAborted,cpDone,cpFailed]) or (ShowStatusOnError)) and (Mode<>cRun) then
+      if ((CompilationPhase in [cpAborted,cpDone,cpFailed]) or (ShowStatusOnError))
+        and ((Mode<>cRun) or (CompilationPhase<>cpDone)) then
        repeat
          CompilerStatusDialog^.GetEvent(E);
          if IsExitEvent(E)=false then
           CompilerStatusDialog^.HandleEvent(E);
        until IsExitEvent(E) or not assigned(CompilerStatusDialog);
+       {if IsExitEvent(E) then
+         Application^.PutEvent(E);}
       if assigned(CompilerStatusDialog) then
         begin
           Application^.Delete(CompilerStatusDialog);
@@ -1279,7 +1287,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.10  2002-09-04 14:07:12  pierre
+  Revision 1.11  2002-09-05 08:45:40  pierre
+   * try to fix recompilation on changes problems
+
+  Revision 1.10  2002/09/04 14:07:12  pierre
    + Enhance code complete by inserting unit symbols
 
   Revision 1.9  2002/08/26 13:03:14  pierre

ide/fpmrun.inc

@@ -49,6 +49,11 @@ begin
    begin
      if (MessageBox(#3+'You''ve edited a file, recompile the project?',nil,mfinformation+mfyesbutton+mfnobutton)=cmYes) then
       begin
+        if Assigned(Debugger) then
+          begin
+            if Debugger^.IsRunning then
+              RestartingDebugger:=true;
+          end;
         DoResetDebugger;
         DoRun;
         AskRecompileIfModified:=true;
@@ -208,7 +213,7 @@ begin
 {$ifndef NODEBUG}
       { we use debugger if and only if there are active breakpoints
         AND the target is correct for debugging !! PM }
-      if ActiveBreakpoints and
+      if (ActiveBreakpoints or RestartingDebugger) and
 {$ifdef COMPILER_1_0}
         (target_os.shortname=source_os.shortname)
 {$else COMPILER_1_0}
@@ -220,7 +225,13 @@ begin
             InitDebugger;
           if assigned(Debugger) then
             begin
-              Debugger^.Run;
+              if RestartingDebugger then
+                begin
+                  RestartingDebugger:=false;
+                  Debugger^.StartTrace;
+                end
+              else
+                Debugger^.Run;
               RunDirect:=false;
             end;
         end;
@@ -472,7 +483,10 @@ end;
 
 {
   $Log$
-  Revision 1.3  2002-08-13 08:59:12  pierre
+  Revision 1.4  2002-09-05 08:45:59  pierre
+   * try to fix recompilation on changes problems
+
+  Revision 1.3  2002/08/13 08:59:12  pierre
    + Run menu changes depending on wether the debuggee is running or not
 
   Revision 1.2  2001/11/07 00:28:53  pierre