mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-13 06:09:14 +02:00
MG: fixed timer checking
git-svn-id: trunk@2120 -
This commit is contained in:
parent
1bd3dc8c42
commit
e90b0b7daf
@ -1987,13 +1987,12 @@ begin
|
|||||||
EventTrace ('TimerCB', nil);
|
EventTrace ('TimerCB', nil);
|
||||||
Result := 0; // assume: timer will stop
|
Result := 0; // assume: timer will stop
|
||||||
|
|
||||||
|
TimerInfo:=PGtkITimerinfo(Data);
|
||||||
|
|
||||||
if (FTimerData=nil) or (FTimerData.IndexOf(Data)<0) then begin
|
if (FTimerData=nil) or (FTimerData.IndexOf(Data)<0) then begin
|
||||||
// timer was killed
|
// timer was killed
|
||||||
Result:=0; // stop timer
|
Result:=0; // stop timer
|
||||||
exit;
|
end else begin
|
||||||
end;
|
|
||||||
|
|
||||||
TimerInfo:=PGtkITimerinfo(Data);
|
|
||||||
if TimerInfo^.TimerFunc <> nil
|
if TimerInfo^.TimerFunc <> nil
|
||||||
then begin
|
then begin
|
||||||
// Call users timer function
|
// Call users timer function
|
||||||
@ -2017,6 +2016,7 @@ begin
|
|||||||
else begin
|
else begin
|
||||||
Result := 0; // stop timer
|
Result := 0; // stop timer
|
||||||
end;
|
end;
|
||||||
|
end;
|
||||||
|
|
||||||
if (Result<>0) and (FTimerData.IndexOf(Data)<0) then begin
|
if (Result<>0) and (FTimerData.IndexOf(Data)<0) then begin
|
||||||
// timer was killed
|
// timer was killed
|
||||||
@ -2496,6 +2496,9 @@ end;
|
|||||||
{ =============================================================================
|
{ =============================================================================
|
||||||
|
|
||||||
$Log$
|
$Log$
|
||||||
|
Revision 1.147 2002/10/15 07:01:29 lazarus
|
||||||
|
MG: fixed timer checking
|
||||||
|
|
||||||
Revision 1.146 2002/10/14 19:00:49 lazarus
|
Revision 1.146 2002/10/14 19:00:49 lazarus
|
||||||
MG: fixed zombie timers
|
MG: fixed zombie timers
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user