From 44681d2596851e691ecaa37109d7e185d4efe80c Mon Sep 17 00:00:00 2001 From: juha Date: Sun, 4 Jul 2021 16:38:47 +0000 Subject: [PATCH] Revert r65359 #f19aac18a2 which deals with TPQTEventMonitor. Crash happens when deleting the component. git-svn-id: trunk@65368 - --- components/sqldb/pqteventmonitor.pas | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/components/sqldb/pqteventmonitor.pas b/components/sqldb/pqteventmonitor.pas index 83e7551812..19e65c8124 100644 --- a/components/sqldb/pqteventmonitor.pas +++ b/components/sqldb/pqteventmonitor.pas @@ -14,7 +14,6 @@ type TPQTEventMonitor=class(TPQEventMonitor) private - FInited:Boolean; Timer:TTimer; function GetPollInterval: integer; procedure OnTimer(Sender: TObject); @@ -35,6 +34,7 @@ implementation procedure TPQTEventMonitor.SetPollInterval(AValue: integer); begin + if Timer.Interval=AValue then Exit; Timer.Interval:=AValue; end; @@ -50,14 +50,8 @@ end; constructor TPQTEventMonitor.Create(AOwner: TComponent); begin - try - inherited Create(AOwner); - FInited:=true; - except - //FPC code raises EInOutError in Create() if Postgres lib was not loaded - FInited:=false; - end; - Timer:=TTimer.Create(self); + inherited Create(AOwner); + Timer:=TTImer.Create(self); Timer.Interval:=500; Timer.Enabled:=false; Timer.OnTimer:=@OnTimer; @@ -65,20 +59,17 @@ end; destructor TPQTEventMonitor.Destroy; begin - if not FInited then exit; inherited Destroy; end; procedure TPQTEventMonitor.RegisterEvents; begin - if not FInited then exit; inherited RegisterEvents; Timer.Enabled:=true; end; procedure TPQTEventMonitor.UnRegisterEvents; begin - if not FInited then exit; Timer.Enabled:=false; inherited UnRegisterEvents; end;