erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-07 09:25:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Merge pull request #11555 from keymanapp/fix/developer/11554-handle-invalid-default-project-path

Browse source 
fix(developer): handle invalid default project path in options
This commit is contained in:
Marc Durdin 2024-05-31 13:06:19 +07:00 • committed by GitHub
commit 4e5b59f016
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
developer/src/tike/main/KeymanDeveloperOptions.pas
View file

@ -82,6 +82,7 @@ type
procedure optWriteBool(const nm: string; value: Boolean);
procedure optWriteInt(const nm: string; value: Integer);
procedure WriteServerConfigurationJson;
class function Get_Initial_DefaultProjectPath: string; static;
public
procedure Read;
procedure Write;
@ -365,7 +366,12 @@ begin
FFix183_LadderLength := optReadInt(SRegValue_IDEOpt_WebLadderLength, CRegValue_IDEOpt_WebLadderLength_Default);
FDefaultProjectPath := IncludeTrailingPathDelimiter(optReadString(SRegValue_IDEOpt_DefaultProjectPath, GetFolderPath(CSIDL_PERSONAL) + CDefaultProjectPath));
FDefaultProjectPath := IncludeTrailingPathDelimiter(optReadString(SRegValue_IDEOpt_DefaultProjectPath, Get_Initial_DefaultProjectPath));
if (FDefaultProjectPath = '\') or IsRelativePath(FDefaultProjectPath) then
begin
// #11554
FDefaultProjectPath := Get_Initial_DefaultProjectPath;
end;
// for consistency with Keyman.System.KeymanSentryClient, we need to use
// reg.ReadInteger, as regReadInt, which in the dim dark past started
@ -613,6 +619,11 @@ begin
Result := DefaultEditorThemeItemIndex(s) >= 0;
end;
class function TKeymanDeveloperOptions.Get_Initial_DefaultProjectPath: string;
begin
Result := GetFolderPath(CSIDL_PERSONAL) + CDefaultProjectPath;
end;
function LoadKeymanDeveloperSentryFlags: TKeymanSentryClientFlags;
begin
Result := [kscfCaptureExceptions, kscfShowUI, kscfTerminate];

21
developer/src/tike/main/UfrmMain.pas
View file

@ -552,11 +552,22 @@ begin
FFilesToOpen := TStringList.Create;
if not ForceDirectories(FKeymanDeveloperOptions.DefaultProjectPath) then
begin
// Fall back to Documents folder if we cannot create the default project path
// Documents folder should always exist
FKeymanDeveloperOptions.DefaultProjectPath := GetFolderPath(CSIDL_PERSONAL);
try
if not ForceDirectories(FKeymanDeveloperOptions.DefaultProjectPath) then
begin
// Fall back to Documents folder if we cannot create the default project path
// Documents folder should always exist
FKeymanDeveloperOptions.DefaultProjectPath := GetFolderPath(CSIDL_PERSONAL);
end;
except
on E:EInOutError do
begin
// If the DefaultProjectPath is a relative, invalid path, then it may
// cause EInOutError (#11554). Note that this exception should no longer
// be possible because the path is sanitized when loaded in
// KeymanDeveloperOptions.pas, but keeping this fallback just in case.
FKeymanDeveloperOptions.DefaultProjectPath := GetFolderPath(CSIDL_PERSONAL);
end;
end;
FFirstShow := True;