From 25ba74cfb4267d076f42afe41d3688cc08d14053 Mon Sep 17 00:00:00 2001
From: Theo Arends <mhtarends@gmail.com>
Date: Wed, 16 May 2018 17:17:31 +0200
Subject: [PATCH] Fix timer re-trigger after restart

5.14.0a
 * Fix timer re-trigger within one minute after restart (#2744)
---
 sonoff/_releasenotes.ino  | 1 +
 sonoff/xdrv_09_timers.ino | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino
index 7c3159de2..02ea82c75 100644
--- a/sonoff/_releasenotes.ino
+++ b/sonoff/_releasenotes.ino
@@ -1,6 +1,7 @@
 /* 5.14.0a
  * Add Eastron SDM630 energy meter (#2735)
  * Add KNX communication enhancement (#2742)
+ * Fix timer re-trigger within one minute after restart (#2744)
  *
  * 5.14.0 20180515
  * Update language files
diff --git a/sonoff/xdrv_09_timers.ino b/sonoff/xdrv_09_timers.ino
index 889a92937..7528dcfad 100644
--- a/sonoff/xdrv_09_timers.ino
+++ b/sonoff/xdrv_09_timers.ino
@@ -262,7 +262,7 @@ void TimerEverySecond()
 {
   if (RtcTime.valid) {
     if (!RtcTime.hour && !RtcTime.minute && !RtcTime.second) { TimerSetRandomWindows(); }  // Midnight
-    if (RtcTime.minute != timer_last_minute) {  // Execute every minute only once
+    if ((uptime > 60) && (RtcTime.minute != timer_last_minute)) {  // Execute from one minute after restart every minute only once
       timer_last_minute = RtcTime.minute;
       int16_t time = (RtcTime.hour *60) + RtcTime.minute;
       uint8_t days = 1 << (RtcTime.day_of_week -1);