Index: sources/view/VTreatmentCreate.cpp
===================================================================
diff -u -r6992763b4202285e647a9aafbdf6752e5707bfe2 -r9ea6aa3bf4e8c4b5ef8970a6c19ad12b5765c58d
--- sources/view/VTreatmentCreate.cpp	(.../VTreatmentCreate.cpp)	(revision 6992763b4202285e647a9aafbdf6752e5707bfe2)
+++ sources/view/VTreatmentCreate.cpp	(.../VTreatmentCreate.cpp)	(revision 9ea6aa3bf4e8c4b5ef8970a6c19ad12b5765c58d)
@@ -63,9 +63,9 @@
     data.mHeparinDispensingRate             = _heparinDispensingRate           ;
     data.mHeparinBolusVolume                = _heparinBolusVolume              ;
 
-    emit didAdjustment(data);
     parametersConfirmed(false);
     parametersValidated(false);
+    emit didAdjustment(data);
 }
 
 /**
@@ -77,8 +77,8 @@
 void VTreatmentCreate::doConfirm() {
     AdjustParametersConfirmRequestData  confirmTreatmentRequest;
     confirmTreatmentRequest.requestedState = AdjustParametersConfirmRequestData::eConfirm;
-    emit didAdjustment(confirmTreatmentRequest);
     parametersConfirmed(true);
+    emit didAdjustment(confirmTreatmentRequest);
 }
 
 /**
@@ -90,9 +90,9 @@
 {
     AdjustParametersConfirmRequestData  confirmTreatmentRequest;
     confirmTreatmentRequest.requestedState = AdjustParametersConfirmRequestData::eCancel;
-    emit didAdjustment(confirmTreatmentRequest);
     parametersValidated(false);
     parametersConfirmed(false);
+    emit didAdjustment(confirmTreatmentRequest);
 }
 
 /**
@@ -139,8 +139,8 @@
     }
     else {
         if ( _txCode.isEmpty()) { generateTxCode(); }
-        emit didValidationPass();
         parametersValidated(true);
+        emit didValidationPass();
     }
 }