Index: sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp
===================================================================
diff -u -r38ae7b93679d05a54fc460dac68891562d7da72d -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp	(.../MTreatmentDialysateFlowData.cpp)	(revision 38ae7b93679d05a54fc460dac68891562d7da72d)
+++ sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp	(.../MTreatmentDialysateFlowData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -33,27 +33,23 @@
 
 bool MDialysateFlow::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mFlowSetPoint    ))
-    if (GetValue(vByteArray, index, _data.mMeasuredFlow    ))
-    if (GetValue(vByteArray, index, _data.mRotorSpeed      ))
-    if (GetValue(vByteArray, index, _data.mMotorSpeed      ))
-    if (GetValue(vByteArray, index, _data.mMotorCtlSpeed   ))
-    if (GetValue(vByteArray, index, _data.mMotorCtlCurrent ))
-    if (GetValue(vByteArray, index, _data.mPWMDutyCycle    ))
-    if (GetValue(vByteArray, index, _data.mRotorCount      ))
-    if (GetValue(vByteArray, index, _data.mPresFlow        ))
-    if (GetValue(vByteArray, index, _data.mRotorHall       ))
+    if ( ! GetValue(vByteArray, index, _data.mFlowSetPoint    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMeasuredFlow    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mRotorSpeed      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMotorSpeed      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMotorCtlSpeed   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMotorCtlCurrent )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mPWMDutyCycle    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mRotorCount      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mPresFlow        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mRotorHall       )) goto lError;
+    
     return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!