Index: sources/model/dg/data/MDGAccelerometerData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/dg/data/MDGAccelerometerData.cpp	(.../MDGAccelerometerData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/dg/data/MDGAccelerometerData.cpp	(.../MDGAccelerometerData.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -36,25 +36,22 @@
 
 bool MDGAccelerometer::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mX     ))
-    if (GetValue(vByteArray, index, _data.mY     ))
-    if (GetValue(vByteArray, index, _data.mZ     ))
-    if (GetValue(vByteArray, index, _data.mXMax  ))
-    if (GetValue(vByteArray, index, _data.mYMax  ))
-    if (GetValue(vByteArray, index, _data.mZMax  ))
-    if (GetValue(vByteArray, index, _data.mXTilt ))
-    if (GetValue(vByteArray, index, _data.mYTilt ))
-    if (GetValue(vByteArray, index, _data.mZTilt ))
-    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; }
+    if ( ! GetValue(vByteArray, index, _data.mX     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mY     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mYMax  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mXMax  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mZ     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mZMax  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mXTilt )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mYTilt )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mZTilt )) goto lError;
+    
+    return true;
+
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false;
 }
 
 MDGAccelerometer::Data MDGAccelerometer::data() const {