Skip to content

fix: Remove double / and load errors #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mvancanneyt merged 1 commit into from
Dec 30, 2023
Merged

fix: Remove double / and load errors #82

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/serverprotocol/PasLS.LazConfig.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -966,7 +966,8 @@ procedure TLazProjectConfig.GuessCodeToolConfig;
begin
Doc := nil;
try
FN:=Dir + DirectorySeparator + 'environmentoptions.xml';
// This way we ensure we don't have 2 backslashes on the path
FN:= IncludeTrailingPathDelimiter(Dir) + 'environmentoptions.xml';
if FileExists(FN) and LoadLazConfig(FN) then
begin
EnvironmentOptions := Root.FindNode('EnvironmentOptions');
Expand All @@ -984,7 +985,10 @@ procedure TLazProjectConfig.GuessCodeToolConfig;
FreeAndNil(Doc);
end;
try
if LoadLazConfig(Dir + DirectorySeparator + 'fpcdefines.xml') then
// This way we ensure we don't have 2 backslashes on the path
FN:= IncludeTrailingPathDelimiter(Dir) + 'fpcdefines.xml';
// Before this change, there were a lot of errors reported
if FileExists(FN) and LoadLazConfig(FN) then
begin
FPCConfigs := Root.FindNode('FPCConfigs');
Item1 := nil;
Expand Down