From a315ebc4289a0e62b1bea69737df3977dafb2146 Mon Sep 17 00:00:00 2001 From: gbamber Date: Sun, 22 Jan 2017 09:49:17 +0000 Subject: [PATCH] Update to Update Pack. Config file is in common location for all OSes git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5685 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../latest_stable/updatepack/umainform.pas | 6 ++++++ .../latest_stable/updatepack/updatepack.lpi | 7 +++++-- .../latest_stable/updatepack/updatepack.lpr | 3 ++- .../latest_stable/updatepack/updatepack.res | Bin 5092 -> 5092 bytes 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/components/lazautoupdate/latest_stable/updatepack/umainform.pas b/components/lazautoupdate/latest_stable/updatepack/umainform.pas index 9246bd882..f6ef1a75d 100644 --- a/components/lazautoupdate/latest_stable/updatepack/umainform.pas +++ b/components/lazautoupdate/latest_stable/updatepack/umainform.pas @@ -840,6 +840,12 @@ begin ShowMessageFmt('Zipfile ''%s'' is OK', [ProfileRec.ZipFileName]) else ShowMessage('Unable to create Zipfile. Is the App path and/or WhatsNew path valid?'); + // Save the current Profile + AppConfig.WriteString('Current', 'Profilename', szCurrentProfileName); + ReadFromGUI(szCurrentProfileName); + WriteProfileToINI(szCurrentProfileName); + bCurrentProfileSaved := True; + // Make up the text for the memo sz := 'Zipfile and INI file are located at:' + LineEnding; sz += ProfileRec.Outdir + LineEnding + LineEnding; diff --git a/components/lazautoupdate/latest_stable/updatepack/updatepack.lpi b/components/lazautoupdate/latest_stable/updatepack/updatepack.lpi index c87a18782..4df46f28f 100644 --- a/components/lazautoupdate/latest_stable/updatepack/updatepack.lpi +++ b/components/lazautoupdate/latest_stable/updatepack/updatepack.lpi @@ -22,8 +22,8 @@ - - + + @@ -159,6 +159,9 @@ + + + diff --git a/components/lazautoupdate/latest_stable/updatepack/updatepack.lpr b/components/lazautoupdate/latest_stable/updatepack/updatepack.lpr index 286257ef0..15e4214c7 100644 --- a/components/lazautoupdate/latest_stable/updatepack/updatepack.lpr +++ b/components/lazautoupdate/latest_stable/updatepack/updatepack.lpr @@ -34,7 +34,8 @@ Const C_PFX = C_OS + C_BITNESS; begin Application.Title:='LazAutoUpdate Update Pack'; - Application.Title:=Application.Title + ' (' + C_PFX + ' edition)'; + // Line below gives unique folders in GetAppConfig call + // Application.Title:=Application.Title + ' (' + C_PFX + ' edition)'; RequireDerivedFormResource := True; Application.Initialize; Application.CreateForm(Tmainform, mainform); diff --git a/components/lazautoupdate/latest_stable/updatepack/updatepack.res b/components/lazautoupdate/latest_stable/updatepack/updatepack.res index 5474b0b025cb424d952402db67f0d87b9a97b4d9..e0072bff1a62d6b8f32c760b0cbcca29a5ba724f 100644 GIT binary patch delta 31 ncmaE&{zQGl2{v{n21W)32ByvD+14_#8ZqcG7;SFkOy&XrlA{P2 delta 31 ncmaE&{zQGl2{v{{21W)32FA_j+14_#8ZziH7;bLlOy&Xrl4}SR