From dc5819a6cd9956a6a827b7763f65de9d1cae92e3 Mon Sep 17 00:00:00 2001
From: gbamber <gbamber@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Fri, 20 Jan 2017 11:20:14 +0000
Subject: [PATCH] BugFix for TestApp

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5681 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../latest_stable/testapp/testapp.lpi         |   8 +-
 .../latest_stable/testapp/testapp.lps         |  84 +++++++++---------
 .../latest_stable/testapp/testapp.res         | Bin 139584 -> 139584 bytes
 .../latest_stable/testapp/umainform.pas       |  17 +++-
 4 files changed, 61 insertions(+), 48 deletions(-)

diff --git a/components/lazautoupdate/latest_stable/testapp/testapp.lpi b/components/lazautoupdate/latest_stable/testapp/testapp.lpi
index 84889eac0..32e8a5f10 100644
--- a/components/lazautoupdate/latest_stable/testapp/testapp.lpi
+++ b/components/lazautoupdate/latest_stable/testapp/testapp.lpi
@@ -19,10 +19,7 @@
     </General>
     <VersionInfo>
       <UseVersionInfo Value="True"/>
-      <MajorVersionNr Value="1"/>
-      <MinorVersionNr Value="1"/>
       <RevisionNr Value="1"/>
-      <BuildNr Value="1"/>
       <StringTable ProductVersion="0.0.0.0"/>
     </VersionInfo>
     <BuildModes Count="5">
@@ -154,6 +151,11 @@
               </Win32>
             </Options>
           </Linking>
+          <Other>
+            <OtherDefines Count="1">
+              <Define0 Value="DEBUGMODE"/>
+            </OtherDefines>
+          </Other>
         </CompilerOptions>
       </Item5>
     </BuildModes>
diff --git a/components/lazautoupdate/latest_stable/testapp/testapp.lps b/components/lazautoupdate/latest_stable/testapp/testapp.lps
index 8c9fc9be1..475fb1965 100644
--- a/components/lazautoupdate/latest_stable/testapp/testapp.lps
+++ b/components/lazautoupdate/latest_stable/testapp/testapp.lps
@@ -3,14 +3,14 @@
   <ProjectSession>
     <PathDelim Value="\"/>
     <Version Value="10"/>
-    <BuildModes Active="Win32"/>
+    <BuildModes Active="Win32Debug"/>
     <Units Count="18">
       <Unit0>
         <Filename Value="testapp.lpr"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="2"/>
-        <CursorPos X="28" Y="19"/>
-        <UsageCount Value="53"/>
+        <CursorPos X="25" Y="28"/>
+        <UsageCount Value="54"/>
         <Loaded Value="True"/>
       </Unit0>
       <Unit1>
@@ -20,9 +20,9 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <IsVisibleTab Value="True"/>
-        <TopLine Value="95"/>
-        <CursorPos X="23" Y="109"/>
-        <UsageCount Value="53"/>
+        <TopLine Value="97"/>
+        <CursorPos Y="111"/>
+        <UsageCount Value="54"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit1>
@@ -33,7 +33,7 @@
         <WindowIndex Value="1"/>
         <TopLine Value="3"/>
         <CursorPos X="76" Y="8"/>
-        <UsageCount Value="36"/>
+        <UsageCount Value="37"/>
         <Loaded Value="True"/>
       </Unit2>
       <Unit3>
@@ -60,7 +60,7 @@
           <TopLine Value="-1"/>
           <CursorPos X="-1" Y="-1"/>
         </ExtraEditor2>
-        <UsageCount Value="26"/>
+        <UsageCount Value="27"/>
         <Loaded Value="True"/>
       </Unit4>
       <Unit5>
@@ -147,7 +147,7 @@
         <WindowIndex Value="1"/>
         <TopLine Value="35"/>
         <CursorPos X="40" Y="51"/>
-        <UsageCount Value="16"/>
+        <UsageCount Value="17"/>
         <Loaded Value="True"/>
       </Unit16>
       <Unit17>
@@ -165,123 +165,123 @@
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="1514" TopLine="1489"/>
+        <Caret Line="61" Column="80" TopLine="37"/>
       </Position1>
       <Position2>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="61" Column="80" TopLine="37"/>
+        <Caret Line="757" Column="2" TopLine="718"/>
       </Position2>
       <Position3>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="757" Column="2" TopLine="718"/>
+        <Caret Line="2282" Column="46" TopLine="2250"/>
       </Position3>
       <Position4>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="2282" Column="46" TopLine="2250"/>
+        <Caret Line="592" Column="3" TopLine="567"/>
       </Position4>
       <Position5>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="592" Column="3" TopLine="567"/>
+        <Caret Line="982" TopLine="966"/>
       </Position5>
       <Position6>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="982" TopLine="966"/>
+        <Caret Line="1745" Column="17" TopLine="1720"/>
       </Position6>
       <Position7>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="1745" Column="17" TopLine="1720"/>
+        <Caret Line="1898" Column="17" TopLine="1873"/>
       </Position7>
       <Position8>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="1898" Column="17" TopLine="1873"/>
+        <Caret Line="2267" TopLine="2247"/>
       </Position8>
       <Position9>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="2267" TopLine="2247"/>
+        <Caret Line="2286" Column="17" TopLine="2247"/>
       </Position9>
       <Position10>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="2286" Column="17" TopLine="2247"/>
+        <Caret Line="2270" TopLine="2246"/>
       </Position10>
       <Position11>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="2270" TopLine="2246"/>
+        <Caret Line="2273" Column="17" TopLine="2246"/>
       </Position11>
       <Position12>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="2273" Column="17" TopLine="2246"/>
+        <Caret Line="2269" TopLine="2244"/>
       </Position12>
       <Position13>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="2269" TopLine="2244"/>
+        <Caret Line="592" Column="3" TopLine="567"/>
       </Position13>
       <Position14>
-        <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="592" Column="3" TopLine="567"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="99" Column="38" TopLine="64"/>
       </Position14>
       <Position15>
         <Filename Value="umainform.pas"/>
-        <Caret Line="99" Column="38" TopLine="64"/>
+        <Caret Line="127" Column="28" TopLine="123"/>
       </Position15>
       <Position16>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="127" Column="28" TopLine="123"/>
+        <Filename Value="..\ulazautoupdate.pas"/>
+        <Caret Line="472" Column="22" TopLine="446"/>
       </Position16>
       <Position17>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="472" Column="22" TopLine="446"/>
+        <Caret Line="1094" Column="27" TopLine="1082"/>
       </Position17>
       <Position18>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="1094" Column="27" TopLine="1082"/>
+        <Caret Line="1117" Column="23" TopLine="1082"/>
       </Position18>
       <Position19>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="1117" Column="23" TopLine="1082"/>
+        <Caret Line="1120" Column="35" TopLine="1082"/>
       </Position19>
       <Position20>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="1120" Column="35" TopLine="1082"/>
+        <Caret Line="1123" Column="35" TopLine="1082"/>
       </Position20>
       <Position21>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="1123" Column="35" TopLine="1082"/>
+        <Caret Line="1316" Column="25" TopLine="1298"/>
       </Position21>
       <Position22>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="1316" Column="25" TopLine="1298"/>
+        <Caret Line="1324" Column="23" TopLine="1298"/>
       </Position22>
       <Position23>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="1324" Column="23" TopLine="1298"/>
+        <Caret Line="1358" Column="73" TopLine="1264"/>
       </Position23>
       <Position24>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="1358" Column="73" TopLine="1264"/>
+        <Caret Line="2187" Column="58" TopLine="2140"/>
       </Position24>
       <Position25>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="2187" Column="58" TopLine="2140"/>
+        <Caret Line="2216" Column="15" TopLine="2169"/>
       </Position25>
       <Position26>
         <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="2216" Column="15" TopLine="2169"/>
+        <Caret Line="2231" Column="46" TopLine="2205"/>
       </Position26>
       <Position27>
-        <Filename Value="..\ulazautoupdate.pas"/>
-        <Caret Line="2231" Column="46" TopLine="2205"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="133" TopLine="113"/>
       </Position27>
       <Position28>
         <Filename Value="umainform.pas"/>
-        <Caret Line="133" TopLine="113"/>
+        <Caret Line="19" Column="43" TopLine="7"/>
       </Position28>
       <Position29>
         <Filename Value="umainform.pas"/>
-        <Caret Line="19" Column="43" TopLine="7"/>
+        <Caret Line="153" TopLine="123"/>
       </Position29>
       <Position30>
         <Filename Value="umainform.pas"/>
-        <Caret Line="153" TopLine="123"/>
+        <Caret Line="165" TopLine="124"/>
       </Position30>
     </JumpHistory>
   </ProjectSession>
diff --git a/components/lazautoupdate/latest_stable/testapp/testapp.res b/components/lazautoupdate/latest_stable/testapp/testapp.res
index 1ef28c4df2ff92c037563e4ef255b8c56026a668..2feb20d57a5c3091f2e52171eb6749f3d47dde80 100644
GIT binary patch
delta 47
wcmX?bh~vN^jtxiHSQ$WI^GP;kMqUF3Jq8dq1kueu+1r1zGj9LM&g3o$06?t_wg3PC

delta 47
ucmX?bh~vN^jtxiHSQ#0BaPvtvWky~@20aEiZvM&M{*#??`%iWzcS!(2R1CZT

diff --git a/components/lazautoupdate/latest_stable/testapp/umainform.pas b/components/lazautoupdate/latest_stable/testapp/umainform.pas
index 9803865ed..d54cea71b 100644
--- a/components/lazautoupdate/latest_stable/testapp/umainform.pas
+++ b/components/lazautoupdate/latest_stable/testapp/umainform.pas
@@ -71,6 +71,7 @@ type
   private
      Logger: TEventLog;
      procedure WriteAndLog(szText: string);
+     procedure CloseLog;
   public
 
   end;
@@ -83,6 +84,15 @@ implementation
 {$R *.lfm}
 
 { Tmainform }
+procedure Tmainform.CloseLog;
+begin
+  If Assigned(Logger) then
+   begin
+    Logger.Info('End of Log');
+    Logger.Active:=False;
+   end;
+end;
+
 procedure Tmainform.WriteAndLog(szText: string);
 begin
   Logger.Info(szText);
@@ -98,7 +108,6 @@ begin
   LazAutoUpdate1.GitHubBranchOrTag:='updates';
   LazAutoUpdate1.ShowUpdateInCaption:=TRUE;
   Caption:=Application.Title;
-  If Assigned(Logger) then FreeAndNil(Logger);
   if FileExistsUTF8(C_LogFileName) then
     DeleteFile(C_LogFileName);
   Application.Processmessages;
@@ -120,8 +129,8 @@ end;
 
 procedure Tmainform.FormDestroy(Sender: TObject);
 begin
-  If Assigned(Logger) then Logger.Info('End of Log');
-  FreeAndNil(Logger);
+  CloseLog;
+  If Assigned(Logger) then FreeAndNil(Logger);
 end;
 
 procedure Tmainform.cmd_NewVersionAvailableClick(Sender: TObject);
@@ -139,6 +148,7 @@ begin
 {$IFDEF DEBUGMODE}
   ShowMessage('Please do not try updating in DEBUG mode');
 {$ELSE}
+  CloseLog;
   LazAutoUpdate1.UpdateToNewVersion;
 {$ENDIF}
 end;
@@ -158,6 +168,7 @@ begin
   {$IFDEF DEBUGMODE}
     ShowMessage('Please do not try updating in DEBUG mode');
   {$ELSE}
+  CloseLog;
   LazAutoUpdate1.AutoUpdate;
   {$ENDIF}
 end;