summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2020-04-14 23:58:36 +0200
committerErich Eckner <git@eckner.net>2020-04-14 23:58:36 +0200
commit8f3fde246f74eed7f8320b583aa085bbb32b5251 (patch)
treed4492268ac24c9773950033c87779d9db77f7750
parent345cc468fd43330fc1d9e3449d11c925ccd64ac5 (diff)
downloadNetzwerkwatchdog-8f3fde246f74eed7f8320b583aa085bbb32b5251.tar.xz
komponenten.pas: fix cert-handling for remdate
-rw-r--r--komponenten.pas2
-rw-r--r--watchdog.lps91
-rw-r--r--watchdog.resbin138696 -> 139052 bytes
3 files changed, 49 insertions, 44 deletions
diff --git a/komponenten.pas b/komponenten.pas
index 5f32aa0..a49184a 100644
--- a/komponenten.pas
+++ b/komponenten.pas
@@ -612,7 +612,7 @@ begin
if pos(';',s)=0 then cert:=''
else cert:=erstesArgument(s,';');
quelle:=s;
- if pos('/',cert)=0 then
+ if (cert<>'') and (pos('/',cert)=0) then
cert:=extractFilePath(application.exeName)+cert;
result:=(cert='') or fileexists(cert);
end;
diff --git a/watchdog.lps b/watchdog.lps
index 9937fc0..a423e5a 100644
--- a/watchdog.lps
+++ b/watchdog.lps
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectSession>
- <Version Value="9"/>
+ <Version Value="11"/>
<BuildModes Active="Default"/>
<Units Count="6">
<Unit0>
@@ -18,6 +18,8 @@
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="Unit1"/>
+ <TopLine Value="95"/>
+ <CursorPos X="23" Y="123"/>
<UsageCount Value="28"/>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/>
@@ -26,9 +28,9 @@
<Filename Value="komponenten.pas"/>
<IsPartOfProject Value="True"/>
<IsVisibleTab Value="True"/>
- <EditorIndex Value="2"/>
- <TopLine Value="487"/>
- <CursorPos X="18" Y="518"/>
+ <EditorIndex Value="1"/>
+ <TopLine Value="557"/>
+ <CursorPos X="24" Y="578"/>
<UsageCount Value="28"/>
<Loaded Value="True"/>
</Unit2>
@@ -48,132 +50,135 @@
</Unit4>
<Unit5>
<Filename Value="tests.konf"/>
- <EditorIndex Value="1"/>
+ <EditorIndex Value="-1"/>
<CursorPos X="74" Y="12"/>
<UsageCount Value="13"/>
- <Loaded Value="True"/>
<DefaultSyntaxHighlighter Value="None"/>
</Unit5>
</Units>
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
<Filename Value="unit1.pas"/>
- <Caret Line="116" Column="88" TopLine="98"/>
+ <Caret Line="142" Column="33" TopLine="136"/>
</Position1>
<Position2>
<Filename Value="unit1.pas"/>
- <Caret Line="58" TopLine="50"/>
+ <Caret Line="78" TopLine="70"/>
</Position2>
<Position3>
<Filename Value="unit1.pas"/>
- <Caret Line="85" TopLine="75"/>
+ <Caret Line="79" TopLine="70"/>
</Position3>
<Position4>
<Filename Value="unit1.pas"/>
- <Caret Line="58" Column="14" TopLine="47"/>
+ <Caret Line="124" TopLine="103"/>
</Position4>
<Position5>
- <Filename Value="unit1.pas"/>
- <Caret Line="37" Column="30" TopLine="15"/>
+ <Filename Value="komponenten.pas"/>
+ <Caret Line="573" Column="29" TopLine="535"/>
</Position5>
<Position6>
- <Filename Value="unit1.pas"/>
- <Caret Line="58" Column="18" TopLine="22"/>
+ <Filename Value="komponenten.pas"/>
+ <Caret Line="563" Column="17" TopLine="520"/>
</Position6>
<Position7>
- <Filename Value="unit1.pas"/>
- <Caret Line="137" Column="77" TopLine="102"/>
+ <Filename Value="komponenten.pas"/>
</Position7>
<Position8>
- <Filename Value="unit1.pas"/>
- <Caret Line="142" Column="33" TopLine="136"/>
+ <Filename Value="komponenten.pas"/>
+ <Caret Line="109" Column="21" TopLine="100"/>
</Position8>
<Position9>
- <Filename Value="unit1.pas"/>
- <Caret Line="78" TopLine="70"/>
+ <Filename Value="komponenten.pas"/>
+ <Caret Line="294" Column="34" TopLine="258"/>
</Position9>
<Position10>
<Filename Value="unit1.pas"/>
- <Caret Line="79" TopLine="70"/>
+ <Caret Line="123" Column="25" TopLine="101"/>
</Position10>
<Position11>
- <Filename Value="unit1.pas"/>
- <Caret Line="124" TopLine="103"/>
+ <Filename Value="komponenten.pas"/>
+ <Caret Line="481" Column="42" TopLine="460"/>
</Position11>
<Position12>
<Filename Value="komponenten.pas"/>
- <Caret Line="573" Column="29" TopLine="535"/>
+ <Caret Line="104" Column="35" TopLine="73"/>
</Position12>
<Position13>
<Filename Value="komponenten.pas"/>
- <Caret Line="563" Column="17" TopLine="520"/>
+ <Caret Line="100" Column="13" TopLine="73"/>
</Position13>
<Position14>
<Filename Value="komponenten.pas"/>
+ <Caret Line="449" Column="14" TopLine="425"/>
</Position14>
<Position15>
<Filename Value="komponenten.pas"/>
- <Caret Line="109" Column="21" TopLine="100"/>
+ <Caret Line="451" Column="23" TopLine="425"/>
</Position15>
<Position16>
<Filename Value="komponenten.pas"/>
- <Caret Line="294" Column="34" TopLine="258"/>
+ <Caret Line="463" Column="21" TopLine="454"/>
</Position16>
<Position17>
- <Filename Value="unit1.pas"/>
- <Caret Line="123" Column="25" TopLine="101"/>
+ <Filename Value="komponenten.pas"/>
+ <Caret Line="507" Column="29" TopLine="486"/>
</Position17>
<Position18>
<Filename Value="komponenten.pas"/>
- <Caret Line="481" Column="42" TopLine="460"/>
+ <Caret Line="506" Column="30" TopLine="491"/>
</Position18>
<Position19>
<Filename Value="komponenten.pas"/>
- <Caret Line="104" Column="35" TopLine="73"/>
</Position19>
<Position20>
<Filename Value="komponenten.pas"/>
- <Caret Line="100" Column="13" TopLine="73"/>
+ <Caret Line="105" Column="33" TopLine="64"/>
</Position20>
<Position21>
<Filename Value="komponenten.pas"/>
- <Caret Line="449" Column="14" TopLine="425"/>
+ <Caret Line="450" Column="14" TopLine="414"/>
</Position21>
<Position22>
<Filename Value="komponenten.pas"/>
- <Caret Line="451" Column="23" TopLine="425"/>
+ <Caret Line="462" Column="13" TopLine="422"/>
</Position22>
<Position23>
<Filename Value="komponenten.pas"/>
- <Caret Line="463" Column="21" TopLine="454"/>
+ <Caret Line="475" Column="29" TopLine="444"/>
</Position23>
<Position24>
- <Filename Value="komponenten.pas"/>
- <Caret Line="507" Column="29" TopLine="486"/>
+ <Filename Value="unit1.pas"/>
+ <Caret TopLine="34"/>
</Position24>
<Position25>
- <Filename Value="komponenten.pas"/>
- <Caret Line="506" Column="30" TopLine="491"/>
+ <Filename Value="unit1.pas"/>
+ <Caret Line="123" Column="23" TopLine="95"/>
</Position25>
<Position26>
<Filename Value="komponenten.pas"/>
+ <Caret Line="126" Column="18" TopLine="108"/>
</Position26>
<Position27>
<Filename Value="komponenten.pas"/>
- <Caret Line="105" Column="33" TopLine="64"/>
+ <Caret Line="297" Column="31" TopLine="281"/>
</Position27>
<Position28>
<Filename Value="komponenten.pas"/>
- <Caret Line="450" Column="14" TopLine="414"/>
+ <Caret Line="605" Column="23" TopLine="589"/>
</Position28>
<Position29>
<Filename Value="komponenten.pas"/>
- <Caret Line="462" Column="13" TopLine="422"/>
+ <Caret Line="117" Column="13" TopLine="100"/>
</Position29>
<Position30>
<Filename Value="komponenten.pas"/>
- <Caret Line="475" Column="29" TopLine="444"/>
+ <Caret Line="574" Column="39" TopLine="546"/>
</Position30>
</JumpHistory>
+ <RunParams>
+ <FormatVersion Value="2"/>
+ <Modes Count="0" ActiveMode="default"/>
+ </RunParams>
</ProjectSession>
</CONFIG>
diff --git a/watchdog.res b/watchdog.res
index e994dfa..f6e8499 100644
--- a/watchdog.res
+++ b/watchdog.res
Binary files differ