paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-17 22:09:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: load lfm: fixup references: added try..except for GlobalFixupReferences

Browse Source 
git-svn-id: trunk@22258 -
This commit is contained in:
mattias 2009-10-22 12:50:59 +00:00
parent 17d85d9ddc
commit f7aa425da1
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ide/include/ide.inc
View File

@ -32,9 +32,7 @@
{$DEFINE DisableFakeMethods}
{$ENDIF}
{$IFNDEF DisableMultiFormProperties}
{$DEFINE VerboseIDEMultiForm}
{$ENDIF}
{off $apptype console}

12
ide/main.pp
View File

@ -5998,14 +5998,20 @@ begin
ReferenceInstanceNames.Clear;
GetFixupInstanceNames(CurRoot,RefRootName,ReferenceInstanceNames);
{$IFNDEF DisableMultiFormProperties}
DebugLn(['TMainIDE.DoFixupComponentReferences BEFORE loading ',i,' ',dbgsName(CurRoot),' RefRoot=',RefRootName,' Refs="',Trim(ReferenceInstanceNames.Text),'"']);
// load the referenced component
Result:=LoadDependencyHidden(RefRootName);
{$ENDIF}
GlobalFixupReferences;
try
GlobalFixupReferences;
except
on E: Exception do begin
DebugLn(['TMainIDE.DoFixupComponentReferences GlobalFixupReferences ',E.Message]);
DumpExceptionBackTrace;
end;
end;
ReferenceInstanceNames.Clear;
GetFixupInstanceNames(CurRoot,RefRootName,ReferenceInstanceNames);
DebugLn(['TMainIDE.DoFixupComponentReferences AFTER loading ',i,' ',dbgsName(CurRoot),' RefRoot=',RefRootName,' Refs="',Trim(ReferenceInstanceNames.Text),'"']);