Fix TObjectList freeing previous child when assigning by SetItem

castle-engine · Jul 11, 2017 · 5e75869 · 5e75869
1 parent 782179e
commit 5e75869
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/src/audio/castlesoundengine.pas b/src/audio/castlesoundengine.pas
@@ -1309,11 +1309,7 @@ procedure TSoundAllocator.ALContextClose;
         if FAllocatedSources[I].Used then
           FAllocatedSources[I].Release;
         { This will free FAllocatedSources[I], as FAllocatedSources owns children }
-        { TODO: Generics.Collections bug, it doesn't free the children in this case,
-          since TList<T>.SetItem doesn't do notification about remove and addition.
-          Leave it non-nil, in this case it will be freed later by FreeAndNil(FAllocatedSources) anyway
         FAllocatedSources[I] := nil;
-        }
       end;
 
     FreeAndNil(FAllocatedSources);
@@ -1445,11 +1441,7 @@ procedure TSoundAllocator.SetMaxAllocatedSources(const Value: Cardinal);
         if FAllocatedSources[I].Used then
           FAllocatedSources[I].Release;
         { This will free FAllocatedSources[I], as FAllocatedSources owns children }
-        { TODO: Generics.Collections bug, it doesn't free the children in this case,
-          since TList<T>.SetItem doesn't do notification about remove and addition.
-          Leave it non-nil, in this case it will be freed later by SetCount anyway.
         FAllocatedSources[I] := nil;
-        }
       end;
       FAllocatedSources.Count := MaxAllocatedSources;
     end;

diff --git a/src/compatibility/generics.collections/src/generics.collections.pas b/src/compatibility/generics.collections/src/generics.collections.pas
@@ -714,7 +714,9 @@ procedure TList<T>.SetItem(AIndex: SizeInt; const AValue: T);
   if (AIndex < 0) or (AIndex >= Count) then
     raise EArgumentOutOfRangeException.CreateRes(@SArgumentOutOfRange);
 
+  Notify(FItems[AIndex], cnRemoved);
   FItems[AIndex] := AValue;
+  Notify(FItems[AIndex], cnAdded);
 end;
 
 function TList<T>.GetEnumerator: TEnumerator;