From dc731a244718550f3b0074b580b6e07a45ba6367 Mon Sep 17 00:00:00 2001 From: mattias Date: Tue, 1 Feb 2005 11:25:16 +0000 Subject: [PATCH] fixed crash on end of package tree git-svn-id: trunk@6721 - --- components/rtticontrols/rttictrls.pas | 7 ++++++- packager/packagelinks.pas | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/components/rtticontrols/rttictrls.pas b/components/rtticontrols/rttictrls.pas index 0e49038559..221a1174da 100644 --- a/components/rtticontrols/rttictrls.pas +++ b/components/rtticontrols/rttictrls.pas @@ -1607,6 +1607,7 @@ begin if CollectValues then FetchValues; if ((FEditor<>nil) or OldEditorExisted) and Assigned(OnEditorChanged) then OnEditorChanged(Self); + UpdateIdleHandler; end; procedure TCustomPropertyLink.FetchValues; @@ -1634,6 +1635,7 @@ begin FIdleHandlerConnected:=false; Application.RemoveOnIdleHandler(@OnApplicationIdle); end; + //debugln('TCustomPropertyLink.UpdateIdleHandler ploReadOnIdle=',dbgs(ploReadOnIdle in Options)); end; end; @@ -2103,10 +2105,10 @@ end; procedure TTICustomEdit.LinkLoadFromProperty(Sender: TObject); begin if Sender=nil then ; + if (FLink.Editor=nil) then exit; //writeln('TTICustomEdit.LinkLoadFromProperty A ',Name, // ' FLink.GetAsText=',FLink.GetAsText,' Text=',Text, // ' PropName=',FLink.TIPropertyName); - if (FLink.Editor=nil) then exit; Text:=FLink.GetAsText; end; @@ -2114,6 +2116,9 @@ procedure TTICustomEdit.LinkSaveToProperty(Sender: TObject); begin if Sender=nil then ; if FLink.Editor=nil then exit; + //writeln('TTICustomEdit.LinkSaveToProperty A ',Name, + // ' FLink.GetAsText=',FLink.GetAsText,' Text=',Text, + // ' PropName=',FLink.TIPropertyName); FLink.SetAsText(Text); end; diff --git a/packager/packagelinks.pas b/packager/packagelinks.pas index 1c0a8d0f84..4cb2e79ebf 100644 --- a/packager/packagelinks.pas +++ b/packager/packagelinks.pas @@ -664,8 +664,8 @@ begin break; end; CurNode:=LinkTree.FindSuccessor(CurNode); - if AnsiCompareText(TPackageLink(CurNode.Data).Name,Dependency.PackageName) - <>0 + if CurNode=nil then break; + if CompareText(TPackageLink(CurNode.Data).Name,Dependency.PackageName)<>0 then begin CurNode:=nil; break;