- Fixed TWorkerThread issue with wrong placed CancelValidation

Author: [email protected]

Source/VirtualTrees.pas

@@ -5977,10 +5977,6 @@ procedure ReleaseThreadReference(Tree: TBaseVirtualTree);
     // Make sure there is no reference remaining to the releasing tree.
     Tree.InterruptValidation;
 
-    // Borland change (used to debug shutdown issue with dangling FCurrentTree reference)
-    Assert(WorkerThread.FCurrentTree <> Tree, 'WorkerThread.FCurrentTree dangling reference!');
-
-
     if WorkerThread.FRefCount = 0 then
     begin
       with WorkerThread do
@@ -6127,7 +6123,6 @@ procedure TWorkerThread.AddTree(Tree: TBaseVirtualTree);
   finally
     FWaiterList.UnlockList;
   end;
-  CancelValidation(Tree);
 end;
 
 //----------------------------------------------------------------------------------------------------------------------
@@ -6143,6 +6138,7 @@ procedure TWorkerThread.RemoveTree(Tree: TBaseVirtualTree);
   finally
     FWaiterList.UnlockList;
   end;
+  CancelValidation(Tree);
 end;
 
 //----------------- TBufferedAnsiString ------------------------------------------------------------------------------------