Index: sources/main.h =================================================================== diff -u -r4509b968b7280dc7e5b21490f9b5ec99f60e878f -r78eb6d8f1c1d917d027cf4ff442ab7c6e0a474f1 --- sources/main.h (.../main.h) (revision 4509b968b7280dc7e5b21490f9b5ec99f60e878f) +++ sources/main.h (.../main.h) (revision 78eb6d8f1c1d917d027cf4ff442ab7c6e0a474f1) @@ -290,9 +290,9 @@ \details The property getter which reads the private variable \return current value */\ - vTYPE vVARIABLE () const { \ + vTYPE vVARIABLE () const { \ if ( ! _##vVARIABLE##ByID ) return _##vVARIABLE; \ - if ( ! _##vLIST.contains ( _##vID ) ) return _##vVARIABLE; \ + if ( ! _##vLIST.contains ( _##vID ) ) return vDEFVALUE; \ QString value = _##vLIST [ _##vID ].vVARIABLE; \ if ( ! value.isEmpty() ) { \ vVARIABLE##Modifier( value ); \ Index: sources/view/confirm/VConfirm.cpp =================================================================== diff -u -rc26b3b11df2e1b2d490f3998c9433e8b8267d539 -r78eb6d8f1c1d917d027cf4ff442ab7c6e0a474f1 --- sources/view/confirm/VConfirm.cpp (.../VConfirm.cpp) (revision c26b3b11df2e1b2d490f3998c9433e8b8267d539) +++ sources/view/confirm/VConfirm.cpp (.../VConfirm.cpp) (revision 78eb6d8f1c1d917d027cf4ff442ab7c6e0a474f1) @@ -17,6 +17,7 @@ // Project #include "GuiController.h" #include "Settings.h" +#include VIEW_DEF_CLASS_ADJUSTMENT(VConfirm) @@ -90,7 +91,13 @@ // cancel ( tr("CLOSE" ) ); // These need to be set to be used in the messageModifier - extraParam1 ( vData.mExtraParam1 ); + if ( vData.mId == GuiConfirmId::GENERIC_CONFIRM_ID_UF_RATE_CHANGE_IN_TX_DURATION_CHANGE ) { + extraParam1 ( qCeil(vData.mExtraParam1 )); + } + else { + extraParam1 ( vData.mExtraParam1 ); + } + extraParam2 ( vData.mExtraParam2 ); extraParam3 ( vData.mExtraParam3 ); extraParam4 ( vData.mExtraParam4 ); Index: sources/view/confirm/VConfirm.h =================================================================== diff -u -rdcc936cba07f797c7cec7bc31b93e163f7f6a55c -r78eb6d8f1c1d917d027cf4ff442ab7c6e0a474f1 --- sources/view/confirm/VConfirm.h (.../VConfirm.h) (revision dcc936cba07f797c7cec7bc31b93e163f7f6a55c) +++ sources/view/confirm/VConfirm.h (.../VConfirm.h) (revision 78eb6d8f1c1d917d027cf4ff442ab7c6e0a474f1) @@ -102,7 +102,6 @@ case 3: param = _extraParam3; break; case 4: param = _extraParam4; break; } - param = qCeil(param); QString replacement = QString("%1").arg(param); //DEBUG qDebug() << "@" << vValue << tmp << replacement; vValue.replace(placeholder, replacement);