Moved the detachment of clients to TPythonEngine.Destroy

Author: pyscripter

Source/PythonEngine.pas

@@ -4319,11 +4319,15 @@ constructor TPythonEngine.Create(AOwner: TComponent);
 end;
 
 destructor TPythonEngine.Destroy;
+var
+  I: Integer;
 begin
   LocalVars := nil;
   GlobalVars := nil;
   Destroying;
   Finalize;
+  for I := 0 to ClientCount - 1 do
+    Clients[I].ClearEngine;
   FClients.Free;
   FInitScript.Free;
   FTraceback.Free;
@@ -4333,7 +4337,6 @@ destructor TPythonEngine.Destroy;
 procedure TPythonEngine.Finalize;
 var
   i: integer;
-  canDetachClients : Boolean;
 begin
   // switch off redirection when the component is destroying,
   // because the form or datamodule is beeing closed, and
@@ -4368,21 +4371,6 @@ procedure TPythonEngine.Finalize;
     except
     end;
   end;
-  // Detach our clients, when engine is being destroyed or one of its clients.
-  canDetachClients := csDestroying in ComponentState;
-  if not canDetachClients then
-    for i := 0 to ClientCount - 1 do
-      if csDestroying in Clients[i].ComponentState then
-      begin
-        canDetachClients := True;
-        Break;
-      end;
-  if canDetachClients then
-  begin
-    for i := 0 to ClientCount - 1 do
-      Clients[i].ClearEngine;
-    FClients.Clear;
-  end;
   // Free our reference
   gPythonEngine               := nil;
   FTimeStruct                 := nil;