Index: sources/model/hd/data/treatment/MTreatmentOutletFlowData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/treatment/MTreatmentOutletFlowData.cpp	(.../MTreatmentOutletFlowData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/data/treatment/MTreatmentOutletFlowData.cpp	(.../MTreatmentOutletFlowData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -36,33 +36,26 @@
 
 bool MOutletFlow::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mRefUFVol        ))
-    if (GetValue(vByteArray, index, _data.mMeasUFVol       ))
-    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.mPWMDtCycle      ))
-    if (GetValue(vByteArray, index, _data.mDopCorrOffset   ))
-    if (GetValue(vByteArray, index, _data.mDopCalcRate     ))
-    if (GetValue(vByteArray, index, _data.mUfCalcRate      ))
-    if (GetValue(vByteArray, index, _data.mRotorHall       ))
-    if (GetValue(vByteArray, index, _data.mCurrentSetUFRate))
-    if (GetValue(vByteArray, index, _data.mDialOutPumpState))
+    if ( ! GetValue(vByteArray, index, _data.mRefUFVol        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMeasUFVol       )) 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.mPWMDtCycle      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDopCorrOffset   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDopCalcRate     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mUfCalcRate      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mRotorHall       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCurrentSetUFRate)) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDialOutPumpState)) 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; }
-    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 ;
 }
 
 /*!