Author: grig27

Source/PythonEngine.pas

@@ -4083,10 +4083,28 @@ procedure TPythonEngine.Finalize;
   FPyDateTime_DateTimeTZType  := nil;
 end;
 
+{var
+  FRunEnsure: Boolean;}
+
 procedure TPythonEngine.AfterLoad;
+var
+  state: PyGILstate_STATE;
 begin
   inherited;
-  Initialize;
+
+  if IsLibrary then
+    FInitialized := True
+  else
+    Initialize;
+
+  {if FRunEnsure then
+    state := PyGILState_Ensure;
+  try
+    Initialize;
+  finally
+    if FRunEnsure then
+      PyGILState_Release(state);
+  end;}
 end;
 
 procedure TPythonEngine.BeforeLoad;
@@ -4227,7 +4245,9 @@ procedure TPythonEngine.Initialize;
   else
     FInitialized := True;
   FIORedirected := False;
+
   InitSysPath;
+
   SetProgramArgs;
   GetTimeStructType;
   GetDateTimeTypes;
@@ -9156,6 +9176,8 @@ procedure PythonVersionFromDLLName(LibName: string; out MajorVersion, MinorVersi
   MinorVersion:= StrToIntDef(LibName, DefaultMinor);
 end;
 
-
+initialization
+  //FRunEnsure := IsLibrary;
+finalization
 end.