X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fsensor.cpp;h=83dcb6d1be3b6bae9610101672bf21973674e655;hb=f7ab597d035a053311c1a8c5baa51b090262f045;hp=ecd06473fb4bdf2234a2c149f19d0b3ae1af849e;hpb=73e4a36bbf828e07b83a779b696875e1f80045cc;p=r2c2.git

diff --git a/source/libr2c2/sensor.cpp b/source/libr2c2/sensor.cpp
index ecd0647..83dcb6d 100644
--- a/source/libr2c2/sensor.cpp
+++ b/source/libr2c2/sensor.cpp
@@ -2,6 +2,7 @@
 #include "layout.h"
 #include "sensor.h"
 
+using namespace std;
 using namespace Msp;
 
 namespace R2C2 {
@@ -42,14 +43,13 @@ void Sensor::tick(const Time::TimeDelta &dt)
 {
 	if(state_confirm_timeout)
 	{
-		state_confirm_timeout -= dt;
+		state_confirm_timeout = max(state_confirm_timeout-dt, Time::zero);
 		if(state_confirm_timeout<=Time::zero)
 		{
 			if(state==MAYBE_INACTIVE)
 				state = INACTIVE;
 			else if(state==MAYBE_ACTIVE)
 				state = ACTIVE;
-			state_confirm_timeout = Time::zero;
 			signal_state_changed.emit(state);
 		}
 	}