Index: sources/model/dg/data/MDGValvesStatesData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/dg/data/MDGValvesStatesData.cpp	(.../MDGValvesStatesData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/dg/data/MDGValvesStatesData.cpp	(.../MDGValvesStatesData.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -39,35 +39,27 @@
 
 bool MDGValvesStates::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetBits (vByteArray, index, _data.mStates, eFlag_Bits_Length))
-    if (GetValue(vByteArray, index, _data.mVRf      ))
-    if (GetValue(vByteArray, index, _data.mVRi      ))
-    if (GetValue(vByteArray, index, _data.mRes      ))
-    if (GetValue(vByteArray, index, _data.mVRo      ))
-    if (GetValue(vByteArray, index, _data.mVPo      ))
-    if (GetValue(vByteArray, index, _data.mVBf      ))
-    if (GetValue(vByteArray, index, _data.mVRc      ))
-    if (GetValue(vByteArray, index, _data.mVDr      ))
-    if (GetValue(vByteArray, index, _data.mVPi      ))
-    if (GetValue(vByteArray, index, _data.mVSP      ))
-    if (GetValue(vByteArray, index, _data.mVR1      ))
-    if (GetValue(vByteArray, index, _data.mVR2      ))
-    if (GetValue(vByteArray, index, _data.mVPd      ))
-        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; }
-    else { if(vIndex) *vIndex = index; return false; }
+    if ( ! GetBits (vByteArray, index, _data.mStates, eFlag_Bits_Length))   goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVRf      ))                   goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVRi      ))                   goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mRes      ))                   goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVRo      ))                   goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVPo      ))                   goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVBf      ))                   goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVRc      ))                   goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVDr      ))                   goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVPi      ))                   goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVSP      ))                   goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVR1      ))                   goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVR2      ))                   goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVPd      ))                   goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!