From 8b3a1a4d809fad299ddb2c54f050c541133b29d9 Mon Sep 17 00:00:00 2001
From: gbamber <gbamber@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Mon, 5 Dec 2016 15:33:48 +0000
Subject: [PATCH] 0.1.15.0 Added free methods in _Destroy

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5425 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 applications/json_packager/jsonpackage.lpi |   8 ++-
 applications/json_packager/jsonpackage.lps |  68 ++++++++++-----------
 applications/json_packager/jsonpackage.res | Bin 120824 -> 120824 bytes
 applications/json_packager/umain.lfm       |   1 +
 applications/json_packager/umain.pas       |  10 ++-
 5 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/applications/json_packager/jsonpackage.lpi b/applications/json_packager/jsonpackage.lpi
index 445447ed3..0e3ca3850 100644
--- a/applications/json_packager/jsonpackage.lpi
+++ b/applications/json_packager/jsonpackage.lpi
@@ -24,8 +24,7 @@
       <UseVersionInfo Value="True"/>
       <AutoIncrementBuild Value="True"/>
       <MinorVersionNr Value="1"/>
-      <RevisionNr Value="14"/>
-      <BuildNr Value="1"/>
+      <RevisionNr Value="15"/>
       <StringTable Comments="Buld configured for Win Linux and Darwin" FileDescription="An editor for OnlinePackageManager update JSON files" InternalName="jsoneditor" LegalCopyright="(c)2016 usernames lainz and minesadorada @ forum.lazarus.freepascal.org" LegalTrademarks="GPL code" OriginalFilename="jsoneditor" ProductName="Lazarus and Freepascal" ProductVersion="1.x and 3.x"/>
     </VersionInfo>
     <BuildModes Count="6">
@@ -131,6 +130,11 @@
               </Win32>
             </Options>
           </Linking>
+          <Other>
+            <OtherDefines Count="1">
+              <Define0 Value="IGNOREPICTURE"/>
+            </OtherDefines>
+          </Other>
         </CompilerOptions>
       </Item4>
       <Item5 Name="Darwin32">
diff --git a/applications/json_packager/jsonpackage.lps b/applications/json_packager/jsonpackage.lps
index debf9743f..f00e5c88a 100644
--- a/applications/json_packager/jsonpackage.lps
+++ b/applications/json_packager/jsonpackage.lps
@@ -20,12 +20,12 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <IsVisibleTab Value="True"/>
-        <TopLine Value="23"/>
-        <CursorPos X="35" Y="39"/>
+        <TopLine Value="466"/>
+        <CursorPos Y="470"/>
         <UsageCount Value="62"/>
         <Bookmarks Count="2">
-          <Item0 Y="484" ID="1"/>
-          <Item1 Y="753"/>
+          <Item0 Y="488" ID="1"/>
+          <Item1 Y="757"/>
         </Bookmarks>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -129,123 +129,123 @@
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="umain.pas"/>
-        <Caret Line="214" Column="18" TopLine="174"/>
+        <Caret Line="403" Column="21" TopLine="363"/>
       </Position1>
       <Position2>
         <Filename Value="umain.pas"/>
-        <Caret Line="397" Column="21" TopLine="357"/>
+        <Caret Line="464" Column="70" TopLine="424"/>
       </Position2>
       <Position3>
         <Filename Value="umain.pas"/>
-        <Caret Line="403" Column="21" TopLine="363"/>
+        <Caret Line="486" Column="21" TopLine="446"/>
       </Position3>
       <Position4>
         <Filename Value="umain.pas"/>
-        <Caret Line="464" Column="70" TopLine="424"/>
+        <Caret Line="598" Column="32" TopLine="558"/>
       </Position4>
       <Position5>
         <Filename Value="umain.pas"/>
-        <Caret Line="486" Column="21" TopLine="446"/>
+        <Caret Line="600" Column="37" TopLine="560"/>
       </Position5>
       <Position6>
         <Filename Value="umain.pas"/>
-        <Caret Line="598" Column="32" TopLine="558"/>
+        <Caret Line="601" Column="23" TopLine="561"/>
       </Position6>
       <Position7>
         <Filename Value="umain.pas"/>
-        <Caret Line="600" Column="37" TopLine="560"/>
+        <Caret Line="620" Column="77" TopLine="580"/>
       </Position7>
       <Position8>
         <Filename Value="umain.pas"/>
-        <Caret Line="601" Column="23" TopLine="561"/>
+        <Caret Line="623" Column="37" TopLine="583"/>
       </Position8>
       <Position9>
         <Filename Value="umain.pas"/>
-        <Caret Line="620" Column="77" TopLine="580"/>
+        <Caret Line="624" Column="23" TopLine="585"/>
       </Position9>
       <Position10>
         <Filename Value="umain.pas"/>
-        <Caret Line="623" Column="37" TopLine="583"/>
+        <Caret Line="628" Column="33" TopLine="589"/>
       </Position10>
       <Position11>
         <Filename Value="umain.pas"/>
-        <Caret Line="624" Column="23" TopLine="585"/>
+        <Caret Line="629" Column="42" TopLine="590"/>
       </Position11>
       <Position12>
         <Filename Value="umain.pas"/>
-        <Caret Line="628" Column="33" TopLine="589"/>
+        <Caret Line="631" Column="37" TopLine="592"/>
       </Position12>
       <Position13>
         <Filename Value="umain.pas"/>
-        <Caret Line="629" Column="42" TopLine="590"/>
+        <Caret Line="632" Column="23" TopLine="593"/>
       </Position13>
       <Position14>
         <Filename Value="umain.pas"/>
-        <Caret Line="631" Column="37" TopLine="592"/>
+        <Caret Line="636" Column="65" TopLine="597"/>
       </Position14>
       <Position15>
         <Filename Value="umain.pas"/>
-        <Caret Line="632" Column="23" TopLine="593"/>
+        <Caret Line="638" Column="37" TopLine="599"/>
       </Position15>
       <Position16>
         <Filename Value="umain.pas"/>
-        <Caret Line="636" Column="65" TopLine="597"/>
+        <Caret Line="639" Column="23" TopLine="600"/>
       </Position16>
       <Position17>
         <Filename Value="umain.pas"/>
-        <Caret Line="638" Column="37" TopLine="599"/>
+        <Caret Line="710" Column="61" TopLine="670"/>
       </Position17>
       <Position18>
         <Filename Value="umain.pas"/>
-        <Caret Line="639" Column="23" TopLine="600"/>
+        <Caret Line="397" TopLine="360"/>
       </Position18>
       <Position19>
         <Filename Value="umain.pas"/>
-        <Caret Line="710" Column="61" TopLine="670"/>
+        <Caret Line="441" Column="5" TopLine="414"/>
       </Position19>
       <Position20>
         <Filename Value="umain.pas"/>
-        <Caret Line="397" TopLine="360"/>
+        <Caret Line="444" Column="42" TopLine="141"/>
       </Position20>
       <Position21>
         <Filename Value="umain.pas"/>
-        <Caret Line="441" Column="5" TopLine="414"/>
+        <Caret Line="386" Column="27" TopLine="377"/>
       </Position21>
       <Position22>
         <Filename Value="umain.pas"/>
-        <Caret Line="444" Column="42" TopLine="141"/>
+        <Caret Line="431" Column="18" TopLine="417"/>
       </Position22>
       <Position23>
         <Filename Value="umain.pas"/>
-        <Caret Line="386" Column="27" TopLine="377"/>
+        <Caret Line="367" Column="18" TopLine="363"/>
       </Position23>
       <Position24>
         <Filename Value="umain.pas"/>
-        <Caret Line="431" Column="18" TopLine="417"/>
+        <Caret Line="36" Column="71" TopLine="10"/>
       </Position24>
       <Position25>
         <Filename Value="umain.pas"/>
-        <Caret Line="367" Column="18" TopLine="363"/>
+        <Caret Line="700" TopLine="682"/>
       </Position25>
       <Position26>
         <Filename Value="umain.pas"/>
-        <Caret Line="36" Column="71" TopLine="10"/>
+        <Caret Line="31" Column="60" TopLine="13"/>
       </Position26>
       <Position27>
         <Filename Value="umain.pas"/>
-        <Caret Line="700" TopLine="682"/>
+        <Caret Line="417" Column="45" TopLine="393"/>
       </Position27>
       <Position28>
         <Filename Value="umain.pas"/>
-        <Caret Line="31" Column="60" TopLine="13"/>
+        <Caret Line="6" Column="60"/>
       </Position28>
       <Position29>
         <Filename Value="umain.pas"/>
-        <Caret Line="417" Column="45" TopLine="393"/>
+        <Caret Line="38" Column="37" TopLine="23"/>
       </Position29>
       <Position30>
         <Filename Value="umain.pas"/>
-        <Caret Line="6" Column="60"/>
+        <Caret Line="388" TopLine="375"/>
       </Position30>
     </JumpHistory>
   </ProjectSession>
diff --git a/applications/json_packager/jsonpackage.res b/applications/json_packager/jsonpackage.res
index 6d3d38a90df859729cf4cc9b5c82154c85fd601e..f3302118fea6f62f0807b2f77ccd57a7926ff00e 100644
GIT binary patch
delta 33
pcmeydp8dyq_6=v)m>C%OH=k!)%*<-apvPd)T+X$<oQtvXECACB3qk+@

delta 33
pcmeydp8dyq_6=v)m>C)PHlJr(%*<-SpvPd?T+X$<oQtvXECAC93qk+@

diff --git a/applications/json_packager/umain.lfm b/applications/json_packager/umain.lfm
index 5ce32477f..1f825d599 100644
--- a/applications/json_packager/umain.lfm
+++ b/applications/json_packager/umain.lfm
@@ -13,6 +13,7 @@ object frmMain: TfrmMain
   OnClose = FormClose
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
+  OnDestroy = FormDestroy
   OnShow = FormShow
   Position = poScreenCenter
   LCLVersion = '1.7'
diff --git a/applications/json_packager/umain.pas b/applications/json_packager/umain.pas
index fc64a6a19..d873589a5 100644
--- a/applications/json_packager/umain.pas
+++ b/applications/json_packager/umain.pas
@@ -138,6 +138,7 @@ type
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCloseQuery(Sender: TObject; var CanClose: boolean);
     procedure FormCreate(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure LoadItemClick(Sender: TObject);
     procedure mnu_fileNewClick(Sender: TObject);
@@ -384,9 +385,6 @@ begin
     CFG.WriteBool('Options', 'Virgin', False);
     CFG.WriteBool('Options', 'DiableWarnings', bDisableWarnings);
     CFG.UpdateFile;
-    Application.ProcessMessages;
-    CFG.Free;
-    slErrorList.Free;
   end;
 end;
 function TfrmMain.CreateUniqueINI(var aCount: integer):Boolean;
@@ -465,6 +463,12 @@ begin
   bDirty := False; // No effect :(
 end;
 
+procedure TfrmMain.FormDestroy(Sender: TObject);
+begin
+    CFG.Free;
+    slErrorList.Free;
+end;
+
 procedure TfrmMain.FormShow(Sender: TObject);
 begin
   bDirty := False;