You've already forked CEF4Delphi
mirror of
https://github.com/salvadordf/CEF4Delphi.git
synced 2026-05-03 01:14:35 +02:00
Moved CefClearSchemeHandlerFactories to the GlobalCEFApp destruction
This commit is contained in:
@@ -12,7 +12,6 @@ object SchemeRegistrationBrowserFrm: TSchemeRegistrationBrowserFrm
|
||||
Font.Style = []
|
||||
OldCreateOrder = False
|
||||
Position = poScreenCenter
|
||||
OnClose = FormClose
|
||||
OnCloseQuery = FormCloseQuery
|
||||
OnCreate = FormCreate
|
||||
OnShow = FormShow
|
||||
|
||||
@@ -82,7 +82,6 @@ type
|
||||
|
||||
procedure FormCreate(Sender: TObject);
|
||||
procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean);
|
||||
procedure FormClose(Sender: TObject; var Action: TCloseAction);
|
||||
|
||||
protected
|
||||
// Variables to control when can we destroy the form safely
|
||||
@@ -226,11 +225,6 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TSchemeRegistrationBrowserFrm.FormClose(Sender: TObject; var Action: TCloseAction);
|
||||
begin
|
||||
CefClearSchemeHandlerFactories;
|
||||
end;
|
||||
|
||||
procedure TSchemeRegistrationBrowserFrm.FormCloseQuery(Sender: TObject; var CanClose: Boolean);
|
||||
begin
|
||||
CanClose := FCanClose;
|
||||
|
||||
@@ -10,7 +10,6 @@ object SchemeRegistrationBrowserFrm: TSchemeRegistrationBrowserFrm
|
||||
Font.Color = clWindowText
|
||||
Font.Height = -11
|
||||
Font.Name = 'Tahoma'
|
||||
OnClose = FormClose
|
||||
OnCloseQuery = FormCloseQuery
|
||||
OnCreate = FormCreate
|
||||
OnShow = FormShow
|
||||
|
||||
@@ -80,7 +80,6 @@ type
|
||||
const browser: ICefBrowser; const frame: ICefFrame;
|
||||
const params: ICefContextMenuParams; commandId: Integer;
|
||||
eventFlags: Cardinal; out Result: Boolean);
|
||||
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
|
||||
procedure GoBtnClick(Sender: TObject);
|
||||
procedure FormShow(Sender: TObject);
|
||||
procedure Timer1Timer(Sender: TObject);
|
||||
@@ -221,12 +220,6 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TSchemeRegistrationBrowserFrm.FormClose(Sender: TObject;
|
||||
var CloseAction: TCloseAction);
|
||||
begin
|
||||
CefClearSchemeHandlerFactories;
|
||||
end;
|
||||
|
||||
procedure TSchemeRegistrationBrowserFrm.FormCloseQuery(Sender: TObject; var CanClose: Boolean);
|
||||
begin
|
||||
CanClose := FCanClose;
|
||||
|
||||
-1
@@ -10,7 +10,6 @@ object SchemeRegistrationBrowserFrm: TSchemeRegistrationBrowserFrm
|
||||
Font.Color = clWindowText
|
||||
Font.Height = -11
|
||||
Font.Name = 'Tahoma'
|
||||
OnClose = FormClose
|
||||
OnCloseQuery = FormCloseQuery
|
||||
OnCreate = FormCreate
|
||||
OnShow = FormShow
|
||||
|
||||
-7
@@ -79,7 +79,6 @@ type
|
||||
const browser: ICefBrowser; const frame: ICefFrame;
|
||||
const params: ICefContextMenuParams; commandId: Integer;
|
||||
eventFlags: Cardinal; out Result: Boolean);
|
||||
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
|
||||
procedure GoBtnClick(Sender: TObject);
|
||||
procedure FormShow(Sender: TObject);
|
||||
procedure Timer1Timer(Sender: TObject);
|
||||
@@ -218,12 +217,6 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TSchemeRegistrationBrowserFrm.FormClose(Sender: TObject;
|
||||
var CloseAction: TCloseAction);
|
||||
begin
|
||||
CefClearSchemeHandlerFactories;
|
||||
end;
|
||||
|
||||
procedure TSchemeRegistrationBrowserFrm.FormCloseQuery(Sender: TObject; var CanClose: Boolean);
|
||||
begin
|
||||
CanClose := FCanClose;
|
||||
|
||||
@@ -820,10 +820,13 @@ end;
|
||||
|
||||
destructor TCefApplicationCore.Destroy;
|
||||
begin
|
||||
if (GlobalCEFApp = Self) then
|
||||
GlobalCEFApp := nil;
|
||||
|
||||
try
|
||||
if FLibLoaded then
|
||||
cef_clear_scheme_handler_factories();
|
||||
|
||||
if (GlobalCEFApp = Self) then
|
||||
GlobalCEFApp := nil;
|
||||
|
||||
if (FProcessType = ptBrowser) then
|
||||
ShutDown;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"UpdateLazPackages" : [
|
||||
{
|
||||
"ForceNotify" : true,
|
||||
"InternalVersion" : 317,
|
||||
"InternalVersion" : 318,
|
||||
"Name" : "cef4delphi_lazarus.lpk",
|
||||
"Version" : "93.1.11.0"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user