paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-11 06:18:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

lcl: fixed TApplication.CreateForm for splashform

Browse Source
This commit is contained in:
mattias 2023-09-06 16:17:49 +02:00
parent a7e90edd46
commit 872608c382
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lcl/include/application.inc
View File

@ -2247,14 +2247,6 @@ begin
if (FCreatingForm=nil) and (Instance is TForm) then if (FCreatingForm=nil) and (Instance is TForm) then
FCreatingForm:=TForm(Instance); FCreatingForm:=TForm(Instance);
Instance.Create(Self); Instance.Create(Self);
ok:=true;
finally
if not ok then begin
TComponent(Reference) := nil;
if FCreatingForm=Instance then
FCreatingForm:=nil;
end;
end;
if (Instance is TForm) then if (Instance is TForm) then
begin begin
@ -2270,6 +2262,16 @@ begin
ProcessMessages; ProcessMessages;
end; end;
end; end;
ok:=true;
finally
if not ok then begin
TComponent(Reference) := nil;
end;
if FCreatingForm=Instance then
FCreatingForm:=nil;
end;
{$IFDEF AfterConstructionDataModuleNotWorking} {$IFDEF AfterConstructionDataModuleNotWorking}
if (Instance is TDataModule) then if (Instance is TDataModule) then
begin begin