From 1e98a63bf447f1ac50062682658c6bbfdddd5b57 Mon Sep 17 00:00:00 2001
From: Stephen Heumann <stephenheumann@gmail.com>
Date: Wed, 16 Feb 2022 21:31:49 -0600
Subject: [PATCH] Avoid generating duplicate "Including ..." messages.

This could happen if a header was saved in the sym file, but the sym file data was not actually used because the source code in the main file did not match what was saved.
---
 Header.pas | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/Header.pas b/Header.pas
index 3dcde22..635fb21 100644
--- a/Header.pas
+++ b/Header.pas
@@ -1195,6 +1195,8 @@ type
 var
    done: boolean;			{for loop termination test}
    typeDispList: typeDispPtr;		{type displacement/pointer table}
+   includeFileName: gsosInStringPtr;	{name of include file}
+   i: 1..maxint;			{loop/index variable}
 
 
    procedure DisposeTypeDispList;
@@ -1294,6 +1296,7 @@ var
    while len > 0 do begin
       giRec.pCount := 7;
       giRec.pathname := pointer(ReadLongString);
+      includeFileName := giRec.pathname; {save name to print later}
       len := len - (giRec.pathname^.size + 18);
       GetFileInfoGS(giRec);
       if ToolError = 0 then begin
@@ -1306,12 +1309,6 @@ var
          match := false;
          len := 0;
          end; {else}
-      if match and progress then begin
-	 write('Including ');
-	 for i := 1 to giRec.pathname^.size do
-            write(giRec.pathname^.theString[i]);
-	 writeln;
-	 end; {if}
       end; {while}
    DatesMatch := match;
    end; {DatesMatch}
@@ -1963,6 +1960,12 @@ if not ignoreSymbols then begin
 	 while not done do begin
             if DatesMatch then begin
                if SourceMatches then begin
+                  if progress then begin
+                     write('Including ');
+                     for i := 1 to includeFileName^.size do
+                        write(includeFileName^.theString[i]);
+                     writeln;
+                     end; {if}
         	  ReadMacroTable;
         	  ReadSymbolTable;
         	  ReadPragmas;