Merge "Return zero delta when delta is not computed"

1 files changed, 4 insertions, 1 deletions

diff --git a/libs/battery/MultiStateCounter.h b/libs/battery/MultiStateCounter.h
index 112fb85051..03e1f2a022 100644
--- a/libs/battery/MultiStateCounter.h
+++ b/libs/battery/MultiStateCounter.h
@@ -168,6 +168,8 @@ void MultiStateCounter<T>::setValue(state_t state, const T& value) {
 
 template <class T>
 const T& MultiStateCounter<T>::updateValue(const T& value, time_t timestamp) {
+    T* returnValue = &emptyValue;
+
     // If the counter is disabled, we ignore the update, except when the counter got disabled after
     // the previous update, in which case we still need to pick up the residual delta.
     if (isEnabled || lastUpdateTimestamp < lastStateChangeTimestamp) {
@@ -178,6 +180,7 @@ const T& MultiStateCounter<T>::updateValue(const T& value, time_t timestamp) {
         if (lastUpdateTimestamp >= 0) {
             if (timestamp > lastUpdateTimestamp) {
                 if (delta(lastValue, value, &deltaValue)) {
+                    returnValue = &deltaValue;
                     time_t timeSinceUpdate = timestamp - lastUpdateTimestamp;
                     for (int i = 0; i < stateCount; i++) {
                         time_t timeInState = states[i].timeInStateSinceUpdate;
@@ -201,7 +204,7 @@ const T& MultiStateCounter<T>::updateValue(const T& value, time_t timestamp) {
     }
     lastValue = value;
     lastUpdateTimestamp = timestamp;
-    return deltaValue;
+    return *returnValue;
 }
 
 template <class T>