Skip to content

U
uniset2
Commit 2992d28c authored by Pavel Vainerman's avatar Pavel Vainerman
Browse files
Options

(DelaTimer): исправление ошибки

parent 50e148ca
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 4 deletions
include/DelayTimer.h
View file @ 2992d28c
...@@ -62,13 +62,15 @@ class DelayTimer ...@@ -62,13 +62,15 @@ class DelayTimer
{ {
if( waiting_off ) if( waiting_off )
{ {
if( !st && pt.checkTime() ) if( pt.checkTime() )
{ {
waiting_off = false; waiting_off = false;
if( !st )
state = false; state = false;
return state; return state;
} }
else if( st != prevState ) else if( st != prevState && !st )
pt.reset(); pt.reset();
prevState = st; prevState = st;
...@@ -77,13 +79,16 @@ class DelayTimer ...@@ -77,13 +79,16 @@ class DelayTimer
if( waiting_on ) if( waiting_on )
{ {
if( st && pt.checkTime() ) if( pt.checkTime() )
{ {
waiting_on = false; waiting_on = false;
if( st )
state = true; state = true;
else
return state; return state;
} }
else if( st != prevState ) else if( st != prevState && st )
pt.reset(); pt.reset();
prevState = st; prevState = st;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment