paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-16 09:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Patch from martin friebe (bug id 14380) to fix streaming of frames

Browse Source 
git-svn-id: trunk@13567 -
This commit is contained in:
michael 2009-08-20 11:29:06 +00:00
parent df1c366428
commit a7ed599879
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rtl/objpas/classes/writer.inc
View File

@ -879,6 +879,7 @@ begin
{ Check if the ancestor can be used } { Check if the ancestor can be used }
HasAncestor := Assigned(Ancestor) and ((Instance = Root) or HasAncestor := Assigned(Ancestor) and ((Instance = Root) or
(Instance.ClassType = Ancestor.ClassType)); (Instance.ClassType = Ancestor.ClassType));
//writeln('TWriter.WriteProperty Name=',PropType^.Name,' Kind=',GetEnumName(TypeInfo(TTypeKind),ord(PropType^.Kind)),' HasAncestor=',HasAncestor);
case PropType^.Kind of case PropType^.Kind of
tkInteger, tkChar, tkEnumeration, tkSet, tkWChar: tkInteger, tkChar, tkEnumeration, tkSet, tkWChar:
@ -1035,14 +1036,17 @@ begin
if HasAncestor then if HasAncestor then
begin begin
AncestorObj := TObject(GetObjectProp(Ancestor, PropInfo)); AncestorObj := TObject(GetObjectProp(Ancestor, PropInfo));
if Assigned(AncestorObj) then if (AncestorObj is TComponent) and
if Assigned(ObjValue) and (ObjValue is TComponent) then
(TComponent(AncestorObj).Owner = FRootAncestor) and begin
(TComponent(ObjValue).Owner = Root) and //writeln('TWriter.WriteProperty AncestorObj=',TComponent(AncestorObj).Name,' OwnerFit=',TComponent(AncestorObj).Owner = FRootAncestor,' ',TComponent(ObjValue).Name,' OwnerFit=',TComponent(ObjValue).Owner = Root);
(UpperCase(TComponent(AncestorObj).Name) = UpperCase(TComponent(ObjValue).Name)) then if (TComponent(AncestorObj).Owner <> FRootAncestor) or
AncestorObj := ObjValue (TComponent(ObjValue).Owner <> Root) or
// else (UpperCase(TComponent(AncestorObj).Name) <> UpperCase(TComponent(ObjValue).Name)) then
// AncestorObj := nil; begin
AncestorObj := nil;
end;
end;
end else end else
AncestorObj := nil; AncestorObj := nil;