pascal/CEF4Delphi
1
0
Fork 0
mirror of https://github.com/salvadordf/CEF4Delphi.git synced 2025-05-13 21:46:53 +02:00
Code Issues Actions Releases Activity

Merge pull request #238 from ahausladen/FMX_OleUninitialize

Browse Source 
Fix "Invalid COM thread model change" with Debug-DLLs for FMX
This commit is contained in:
Salvador Díaz Fau 2019-11-09 15:43:58 +01:00 committed by GitHub
commit c1e196ffcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/uCEFApplication.pas
View File

@ -51,7 +51,7 @@ interface
uses uses
{$IFDEF DELPHI16_UP} {$IFDEF DELPHI16_UP}
{$IFDEF MSWINDOWS} {$IFDEF MSWINDOWS}
WinApi.Windows, {$IFNDEF FMX}Vcl.Forms, WinApi.ActiveX,{$ENDIF} WinApi.Windows, WinApi.ActiveX, {$IFNDEF FMX}Vcl.Forms,{$ENDIF}
{$ENDIF} {$ENDIF}
System.Classes, System.UITypes, System.Classes, System.UITypes,
{$ELSE} {$ELSE}
@ -847,6 +847,15 @@ begin
end; end;
end; 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}
{$ENDIF} {$ENDIF}