paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-25 15:19:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert r65359 #f19aac18a2 which deals with TPQTEventMonitor. Crash happens when deleting the component.

Browse Source 
git-svn-id: trunk@65368 -
This commit is contained in:
juha 2021-07-04 16:38:47 +00:00
parent 3fc780574a
commit 44681d2596
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
components/sqldb/pqteventmonitor.pas
View File

@ -14,7 +14,6 @@ type
TPQTEventMonitor=class(TPQEventMonitor) TPQTEventMonitor=class(TPQEventMonitor)
private private
FInited:Boolean;
Timer:TTimer; Timer:TTimer;
function GetPollInterval: integer; function GetPollInterval: integer;
procedure OnTimer(Sender: TObject); procedure OnTimer(Sender: TObject);
@ -35,6 +34,7 @@ implementation
procedure TPQTEventMonitor.SetPollInterval(AValue: integer); procedure TPQTEventMonitor.SetPollInterval(AValue: integer);
begin begin
if Timer.Interval=AValue then Exit;
Timer.Interval:=AValue; Timer.Interval:=AValue;
end; end;
@ -50,14 +50,8 @@ end;
constructor TPQTEventMonitor.Create(AOwner: TComponent); constructor TPQTEventMonitor.Create(AOwner: TComponent);
begin begin
try inherited Create(AOwner);
inherited Create(AOwner); Timer:=TTImer.Create(self);
FInited:=true;
except
//FPC code raises EInOutError in Create() if Postgres lib was not loaded
FInited:=false;
end;
Timer:=TTimer.Create(self);
Timer.Interval:=500; Timer.Interval:=500;
Timer.Enabled:=false; Timer.Enabled:=false;
Timer.OnTimer:=@OnTimer; Timer.OnTimer:=@OnTimer;
@ -65,20 +59,17 @@ end;
destructor TPQTEventMonitor.Destroy; destructor TPQTEventMonitor.Destroy;
begin begin
if not FInited then exit;
inherited Destroy; inherited Destroy;
end; end;
procedure TPQTEventMonitor.RegisterEvents; procedure TPQTEventMonitor.RegisterEvents;
begin begin
if not FInited then exit;
inherited RegisterEvents; inherited RegisterEvents;
Timer.Enabled:=true; Timer.Enabled:=true;
end; end;
procedure TPQTEventMonitor.UnRegisterEvents; procedure TPQTEventMonitor.UnRegisterEvents;
begin begin
if not FInited then exit;
Timer.Enabled:=false; Timer.Enabled:=false;
inherited UnRegisterEvents; inherited UnRegisterEvents;
end; end;