Merge branch 'master' into add-code-of-conduct-1

open62541 · Nov 8, 2017 · 90e4064 · 90e4064
2 parents e96834c + 00dcc1e
commit 90e4064
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/ua_timer.c b/src/ua_timer.c
@@ -337,7 +337,10 @@ UA_Timer_process(UA_Timer *t, UA_DateTime nowMonotonic,
     processChanges(t);
 
     /* Return timestamp of next repetition */
-    return SLIST_FIRST(&t->repeatedCallbacks)->nextTime;
+    tc = SLIST_FIRST(&t->repeatedCallbacks);
+    if(!tc)
+        return UA_INT64_MAX; /* Main-loop has a max timeout / will continue earlier */
+    return tc->nextTime;
 }
 
 void