Commit 38f570de authored by Pavel Vainerman's avatar Pavel Vainerman

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

parent bb3491fc
...@@ -62,34 +62,39 @@ class DelayTimer ...@@ -62,34 +62,39 @@ class DelayTimer
{ {
if( waiting_off ) if( waiting_off )
{ {
if( !st && pt.checkTime() ) if( pt.checkTime() )
{ {
waiting_off = false; waiting_off = false;
state = false; if( !st )
state = false;
return state; return state;
} }
else if( st != prevState ) else if( st != prevState && !st )
pt.reset(); pt.reset();
prevState = st; prevState = st;
return state; return state;
} }
if( waiting_on ) if( waiting_on )
{ {
if( st && pt.checkTime() ) if( pt.checkTime() )
{ {
waiting_on = false; waiting_on = false;
state = true; if( st )
return state; state = true;
else
return state;
} }
else if( st != prevState ) else if( st != prevState && st )
pt.reset(); pt.reset();
prevState = st; prevState = st;
return state; return state;
} }
if( state != st ) if( state != st )
{ {
prevState = st; prevState = st;
...@@ -103,11 +108,11 @@ class DelayTimer ...@@ -103,11 +108,11 @@ class DelayTimer
pt.setTiming(offDelay); pt.setTiming(offDelay);
waiting_off = true; waiting_off = true;
} }
if( pt.checkTime() ) if( pt.checkTime() )
return st; return st;
} }
return state; return state;
} }
......
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