Variable fixup

Author: Thulinma

src/controller/controller_variables.cpp

@@ -74,14 +74,15 @@ namespace Controller{
           uint32_t interval = varAccX.getInt(fInterval, i);
           uint64_t lastRun = varAccX.getInt(fLastRun, i);
           uint32_t waitTime = varAccX.getInt(fWaitTime, i);
-          if (!lastRun || (interval && (lastRun + interval < now))) {
+          if (!lastRun || (interval && (lastRun + interval <= now))) {
             // Set the wait time to the interval, or 1 second if it is less than 1 second
             if (!waitTime) { waitTime = interval; }
             if (waitTime < 1000) { waitTime = 1000; }
             if (!runVariableTarget(name, target, waitTime)) {
               if (interval && now + interval < nextCheck) { nextCheck = now + interval; }
             }
           } else {
+            // Set the wait time to the next run for this variable (if less than current wait time)
             if (interval && lastRun + interval < nextCheck) { nextCheck = lastRun + interval; }
           }
         }