Index: sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp =================================================================== diff -u -rae31b8fc6d423cdcbe99c60c711d6175da6be8fb -rfaf6802c35d530181106342f840b4cd9c851e272 --- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp (.../VCommonAdjustmentVitals.cpp) (revision ae31b8fc6d423cdcbe99c60c711d6175da6be8fb) +++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp (.../VCommonAdjustmentVitals.cpp) (revision faf6802c35d530181106342f840b4cd9c851e272) @@ -201,19 +201,19 @@ totalCount( past * 60 + _now.time().second()); // Seconds until the next interval mark - total_sec_left (_interval * 60 - _totalCount); + int totalSecLeft = _interval * 60 - _totalCount; - // when exactly on mark, show full interval - if (_total_sec_left <= 1 ) { + // trigger timeout when timer countdown is done + if (totalSecLeft <= 1 ) { timerStop(); emit didTrigger(); } // construct count down string - _counter_min = _total_sec_left / 60; - _counter_sec = _total_sec_left % 60; - countdown( QStringLiteral("%1:%2") .arg(_counter_min,2,10,QChar('0')) - .arg(_counter_sec,2,10,QChar('0')) ); + int counter_min = totalSecLeft / 60; + int counter_sec = totalSecLeft % 60; + countdown( QStringLiteral("%1:%2") .arg(counter_min,2,10,QChar('0')) + .arg(counter_sec,2,10,QChar('0')) ); } /*! Index: sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h =================================================================== diff -u -rae31b8fc6d423cdcbe99c60c711d6175da6be8fb -rfaf6802c35d530181106342f840b4cd9c851e272 --- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h (.../VCommonAdjustmentVitals.h) (revision ae31b8fc6d423cdcbe99c60c711d6175da6be8fb) +++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h (.../VCommonAdjustmentVitals.h) (revision faf6802c35d530181106342f840b4cd9c851e272) @@ -38,8 +38,6 @@ friend class ::tst_views; int _timerId = 0; // 0 means no timer started or failed to start. - int _counter_sec = 0; - int _counter_min = 0; QDateTime _now ; // Vitals data @@ -60,7 +58,6 @@ READONLY( QString , lastRead , "") READONLY( QString , countdown , "") READONLY( int , totalCount , 0) - PROPERTY( int , total_sec_left , 0) // vitals PROPERTY( quint16 , systolic , 0)