portable fixes

SergeyRock · Dec 12, 2019 · 84f17e3 · 84f17e3
1 parent ff495a5
commit 84f17e3
Show file tree

Hide file tree

Showing 7 changed files with 4,671 additions and 10 deletions.
diff --git a/NightscoutWatcher.dpr b/NightscoutWatcher.dpr
@@ -34,7 +34,7 @@ uses
 
 begin
   Application.Initialize;
-  Application.Title:='Nightscout Watcher';
+  Application.Title := 'Nightscout Watcher';
   Application.CreateForm(TfMain, fMain);
   Application.Run;
 end.
diff --git a/NightscoutWatcher.lpi b/NightscoutWatcher.lpi
@@ -25,8 +25,8 @@
       <AutoIncrementBuild Value="True"/>
       <MajorVersionNr Value="2"/>
       <MinorVersionNr Value="11"/>
-      <RevisionNr Value="2"/>
-      <BuildNr Value="122"/>
+      <RevisionNr Value="3"/>
+      <BuildNr Value="125"/>
       <StringTable CompanyName="Sergey Oleynikov" LegalCopyright="Sergey Oleynikov" ProductName="Nightscout Watcher"/>
     </VersionInfo>
     <BuildModes Count="3">
@@ -38,7 +38,6 @@
           <SearchPaths>
             <IncludeFiles Value="Forms;Units;$(ProjOutDir)"/>
             <OtherUnitFiles Value="Forms;Units"/>
-            <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <Parsing>
             <SyntaxOptions>
@@ -80,7 +79,7 @@
           <SearchPaths>
             <IncludeFiles Value="Forms;Units;$(ProjOutDir)"/>
             <OtherUnitFiles Value="Forms;Units"/>
-            <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+            <UnitOutputDirectory Value="r:\Дом\Здоровье\NightscoutWatcher"/>
           </SearchPaths>
           <Parsing>
             <SyntaxOptions>

diff --git a/forms/ufMain.pas b/forms/ufMain.pas
@@ -1175,16 +1175,17 @@ function TfMain.GetDrawStageSize(DrawStage: TDrawStage; ScaleIndex: Integer = -1
 
 function TfMain.LoadEntriesData: Boolean;
 var
-  FileName, Msg, DummyText: string;
+  FileName, Msg, DummyText, Url: string;
   IsFileDownloaded: Boolean;
 begin
   Result := False;
   FileName := TSettings.GetEntriesFileName;
   Entries.Clear;
   if not DebugMode then
   begin
-    DeleteUrlCacheEntry(PAnsiChar(Settings.GetEntriesUrlByHours()));
-    IsFileDownloaded := URLDownloadToFile(nil, PAnsiChar(Settings.GetEntriesUrlByHours()), PAnsiChar(FileName), 0, nil) = S_OK;
+    Url := Settings.GetEntriesUrlByHours();
+    DeleteUrlCacheEntry(PAnsiChar(Url));
+    IsFileDownloaded := URLDownloadToFile(nil, PAnsiChar(Url), PAnsiChar(FileName), 0, nil) = S_OK;
 
     if not IsFileDownloaded then
     begin