Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r89736e4c0a2e534eeeee5395a4537d08a3d0f3bd --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 89736e4c0a2e534eeeee5395a4537d08a3d0f3bd) @@ -153,7 +153,7 @@ function onHomeChanged ( vValue ) { page( _startupScreen , vValue )} function onStandbyChanged ( vValue ) { /* It depends on the subModes of the standBy. Handled by onHome. */ } function onStandbyStartChanged ( vValue ) { /* It depends on the subModes of the standBy. Handled by onHome. */ } - function onStandbyWaitTreatmentChanged ( vValue ) { /* It depends on the subModes of the standBy. Handled by onHome. */ } + function onStandbyWaitTreatmentChanged ( vValue ) { if ( vValue ) vDisinfectAdjustDisinfect.hasCancel = false } function onStandbyWaitDisinfectChanged ( vValue ) { page( _disinfectStack , vValue )} function onValidateParametersChanged ( vValue ) { _preTreatmentCreateStack.clear ( vValue ) // vValue == true if enterig the state ( clear only on entering). Index: sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h =================================================================== diff -u -ra9e71bdcefc289e2488368f47b1ba4795cd9e878 -r89736e4c0a2e534eeeee5395a4537d08a3d0f3bd --- sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h (.../MAdjustHDInstitutionalRecordResponse.h) (revision a9e71bdcefc289e2488368f47b1ba4795cd9e878) +++ sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h (.../MAdjustHDInstitutionalRecordResponse.h) (revision 89736e4c0a2e534eeeee5395a4537d08a3d0f3bd) @@ -62,7 +62,7 @@ * | #24:(F32) | \ref Data::mMaxHepDispRateMLPHR | * | #25:(F32) | \ref Data::mMinHepBolVolumeML | * | #26:(F32) | \ref Data::mMaxHepBolVolumeML | - * | #26:(U32) | \ref Data::mEnableChemicalDisinfect | + * | #27:(U32) | \ref Data::mEnableChemicalDisinfect | * * \sa Data * Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r89736e4c0a2e534eeeee5395a4537d08a3d0f3bd --- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp (.../VDisinfectAdjustDisinfect.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp (.../VDisinfectAdjustDisinfect.cpp) (revision 89736e4c0a2e534eeeee5395a4537d08a3d0f3bd) @@ -89,7 +89,6 @@ */ void View::VDisinfectAdjustDisinfect::doDisinfectCancel() { - hasCancel(false); AdjustDisinfectModeRequestData vData; vData.mInititate = Model::MAdjustDisinfectModeReq::eCancel; emit didAdjustment(vData);