From 26ae5a4dd49ac0b837747ed17f39e19019df1610 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xose=20P=C3=A9rez?= <xose.perez@gmail.com>
Date: Mon, 19 Dec 2016 13:22:50 +0100
Subject: [PATCH] Prevent inching when manually switched back

---
 code/src/relay.ino | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/code/src/relay.ino b/code/src/relay.ino
index fd751a25..99e6348f 100644
--- a/code/src/relay.ino
+++ b/code/src/relay.ino
@@ -71,8 +71,11 @@ void relayInching(unsigned char id) {
     if (relayInch == RELAY_INCHING_NONE) return;
 
     bool status = relayStatus(id);
-    if ((relayInch == RELAY_INCHING_ON) & (status)) return;
-    if ((relayInch == RELAY_INCHING_OFF) & (!status)) return;
+    bool inchingStatus = (relayInch == RELAY_INCHING_ON);
+    if (inchingStatus == status) {
+        inching.detach();
+        return;
+    }
 
     inching.attach(
         getSetting("relayInchTime", String(RELAY_INCHING_TIME)).toInt(),
@@ -116,7 +119,7 @@ bool relayStatus(unsigned char id, bool status, bool report) {
     if (report) relayMQTT(id);
     if (!recursive) relayWS();
     return changed;
-    
+
 }
 
 void relaySync(unsigned char id) {