From 8f1965f863acf65ebd604811284f3e2c3670013e Mon Sep 17 00:00:00 2001
From: Massimo Melina <a@rejetto.com>
Date: Sun, 24 May 2020 17:03:31 +0200
Subject: [PATCH] tpl to be treated as diff tpl, inheriting the default tpl

---
 classesLib.pas | 16 ++++++++++------
 main.pas       | 25 ++++++++++++-------------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/classesLib.pas b/classesLib.pas
index 9e4cc9a..159e29a 100644
--- a/classesLib.pas
+++ b/classesLib.pas
@@ -909,18 +909,22 @@ end;
 
 function Ttpl.getSection(section:string; inherit:boolean=TRUE):PtplSection;
 begin
-try result:=sections[section]
-except result:=NIL
-  end;
+if sections.containsKey(section) then
+  result:=sections[section]
+else
+  result:=NIL;
 if inherit and assigned(over) and ((result = NIL) or (trim(result.txt) = '')) then
   result:=over.getSection(section);
 end; // getSection
 
 function Ttpl.getTxt(section:string):string;
+var p: PtplSection;
 begin
-try result:=getSection(section).txt
-except result:=''
-  end;
+p:=getSection(section);
+if p = NIL then
+  result:=''
+else
+  result:=p.txt
 end; // getTxt
 
 function Ttpl.getTxtByExt(fileExt:string):string;
diff --git a/main.pas b/main.pas
index 6a11fbd..0733326 100644
--- a/main.pas
+++ b/main.pas
@@ -1131,9 +1131,8 @@ var
   addingItemsCounter: integer = -1; // -1 is disabled
   stopAddingItems, queryingClose: boolean;
   port: string;
-  defaultTpl: string;
   lastWindowRect: Trect;
-  dmBrowserTpl, filelistTpl: Ttpl;
+  defaultTpl, dmBrowserTpl, filelistTpl: Ttpl;
   tplEditor: string;
   tplLast: Tdatetime;
   tplImport: boolean;
@@ -4496,7 +4495,7 @@ finally
 end; // runTplImport
 
 // returns true if template was patched
-function setTplText(text:string):boolean;
+function setTplText(text:string=''):boolean;
 (* postponed to next release
   procedure patch290();
   {$J+}
@@ -4528,8 +4527,10 @@ function setTplText(text:string):boolean;
 begin
 result:=FALSE; // mod by mars
 //patch290();
+if trim(text) = trim(defaultTpl.fullText) then
+  text:='';
 tpl.fullText:=text;
-tplIsCustomized:= text <> defaultTpl;
+tplIsCustomized:= text > '';
 if boolOnce(tplImport) then
   runTplImport();
 end; // setTplText
@@ -4545,7 +4546,7 @@ if fileExists(tplFilename) then
 else if tplLast <> 0 then
   begin
   tplLast:=0; // we have no modified-time in this case, but this will stop the refresh
-  setTplText(defaultTpl);
+  setTplText();
   end;
 end; // keepTplUpdated
 
@@ -7161,7 +7162,7 @@ if lastGoodLogWidth > 0 then
 if lastGoodConnHeight > 0 then
   connPnl.Height:=lastGoodConnHeight;
 if not fileExists(tplFilename) then
-  setTplText(defaultTpl);
+  setTplText();
 srv.persistentConnections:=persistentconnectionsChk.Checked;
 applyFilesBoxRatio();
 updateRecentFilesMenu();
@@ -11575,7 +11576,7 @@ begin
 if not fileExists(tplFilename) then
   begin
   tplFilename:=TPL_FILE;
-  saveTextFile(tplFilename, defaultTpl);
+  saveTextFile(tplFilename, defaultTpl.fullText);
   end;
 exec(getTplEditor(), '"'+tplFilename+'"');
 end;
@@ -11931,7 +11932,7 @@ and only1instanceChk.checked and not mono.master then
   end;
 
 if not cfgLoaded then
-  setTplText(defaultTpl);
+  setTplText();
   
 processParams_before(params);
 
@@ -12526,11 +12527,8 @@ else
   tmpPath:=getTempDir();
 lastUpdateCheckFN:=tmpPath+'HFS last update check.tmp';
 setCurrentDir(exePath); // sometimes people mess with the working directory, so we force it to the exe path
-if fileExists('default.tpl') then
-  defaultTpl:=loadTextfile('default.tpl')
-else
-  defaultTpl:=getRes('defaultTpl');
-tpl:=Ttpl.create();
+defaultTpl:=Ttpl.create(getRes('defaultTpl'));
+tpl:=Ttpl.create('', defaultTpl);
 defSorting:='name';
 dmBrowserTpl:=Ttpl.create(getRes('dmBrowserTpl'));
 filelistTpl:=Ttpl.create(getRes('filelistTpl'));
@@ -12590,6 +12588,7 @@ FINALIZATION
 progFrm.free;
 toDelete.free;
 tpl.free;
+defaultTpl.Free;
 filelistTpl.free;
 autoupdatedFiles.free;
 iconsCache.free;