1
0
mirror of https://github.com/salvadordf/CEF4Delphi.git synced 2025-05-23 21:50:21 +02:00

Fix "Invalid COM thread model change" with Debug-DLLs for FMX

This commit is contained in:
Andreas Hausladen 2019-11-09 12:42:40 +01:00
parent d950813081
commit b9b25a9af1

View File

@ -51,7 +51,7 @@ interface
uses
{$IFDEF DELPHI16_UP}
{$IFDEF MSWINDOWS}
WinApi.Windows, {$IFNDEF FMX}Vcl.Forms, WinApi.ActiveX,{$ENDIF}
WinApi.Windows, WinApi.ActiveX, {$IFNDEF FMX}Vcl.Forms,{$ENDIF}
{$ENDIF}
System.Classes, System.UITypes,
{$ELSE}
@ -847,6 +847,15 @@ begin
end;
end;
end;
{$ELSE} // FMX
{$IFDEF MSWINDOWS}
if ProcessType <> ptBrowser then
begin
// Undo the OleInitialize from FMX.Platform.Win::initialization. The sub-processes want a different
// COM thread model and fail with an assertion if the Debug-DLLs are used.
OleUninitialize;
end;
{$ENDIF MSWINDOWS}
{$ENDIF}
{$ENDIF}