Small fix: save install directory early.

LongDirtyAnimAlf · Aug 7, 2021 · 925dad4 · 925dad4
1 parent 1c04183
commit 925dad4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/fpcupdeluxe.res b/fpcupdeluxe.res
diff --git a/fpcupdeluxemainform.pas b/fpcupdeluxemainform.pas
@@ -370,7 +370,7 @@ procedure TForm1.FormCreate(Sender: TObject);
 begin
   MessageTrigger:=false;
 
-  IniPropStorageApp.IniFileName:=IncludeTrailingPathDelimiter(SafeGetApplicationPath)+installerUniversal.DELUXEFILENAME;
+  IniPropStorageApp.IniFileName:=SafeGetApplicationPath+installerUniversal.DELUXEFILENAME;
 
   {$ifdef EnableLanguages}
   sLanguage:='en';
@@ -461,7 +461,7 @@ procedure TForm1.FormCreate(Sender: TObject);
 
   //Prevent overwriting an existing install when starting with a new fpcupdeluxe install
   If DirectoryExists(sInstallDir) then
-    sInstallDir:=IncludeTrailingPathDelimiter(SafeGetApplicationPath)+'fpcupdeluxe';
+    sInstallDir:=SafeGetApplicationPath+'fpcupdeluxe';
 
   {$ifdef DARWIN}
   // we could have started from with an .app , so goto the basedir ... not sure if realy needed, but to be sure.
@@ -4555,6 +4555,8 @@ function TForm1.SetFPCUPSettings(IniDirectory:string):boolean;
   try
     with TMemIniFile.Create(aDir+DirectorySeparator+installerUniversal.DELUXEFILENAME) do
     try
+      WriteString('General','InstallDirectory',sInstallDir);
+
       WriteBool('General','Gitlab',chkGitlab.Checked);
 
       // mmm, is this correct ?  See extrasettings !!