Index: sources/model/dg/data/MDGHeatersData.cpp
===================================================================
diff -u -r38ae7b93679d05a54fc460dac68891562d7da72d -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/dg/data/MDGHeatersData.cpp	(.../MDGHeatersData.cpp)	(revision 38ae7b93679d05a54fc460dac68891562d7da72d)
+++ sources/model/dg/data/MDGHeatersData.cpp	(.../MDGHeatersData.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -37,33 +37,26 @@
 
 bool MDGHeaters::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mMainPrimayHeaterDC       ))
-    if (GetValue(vByteArray, index, _data.mSmallPrimaryHeaterDC     ))
-    if (GetValue(vByteArray, index, _data.mTrimmerHeaterDC          ))
-    if (GetValue(vByteArray, index, _data.mPrimaryTargetTemp        ))
-    if (GetValue(vByteArray, index, _data.mTrimmerTargetTemp        ))
-    if (GetValue(vByteArray, index, _data.mPrimaryHeaterState       ))
-    if (GetValue(vByteArray, index, _data.mTrimmerHeaterState       ))
-    if (GetValue(vByteArray, index, _data.mPrimaryEfficiency        ))
-    if (GetValue(vByteArray, index, _data.mPrimaryCalcTargetTemp    ))
-    if (GetValue(vByteArray, index, _data.mTrimmerCalcCurrentTemp   ))
-    if (GetValue(vByteArray, index, _data.mTrimmerUseLastDC         ))
-    if (GetValue(vByteArray, index, _data.mTrimmerPreviousFlow      ))
-    if (GetValue(vByteArray, index, _data.mTrimmerContolCounter     ))
-                            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; }
+    if ( ! GetValue(vByteArray, index, _data.mMainPrimayHeaterDC       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mSmallPrimaryHeaterDC     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTrimmerHeaterDC          )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mPrimaryTargetTemp        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTrimmerTargetTemp        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mPrimaryHeaterState       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTrimmerHeaterState       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mPrimaryEfficiency        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mPrimaryCalcTargetTemp    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTrimmerCalcCurrentTemp   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTrimmerUseLastDC         )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTrimmerPreviousFlow      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTrimmerContolCounter     )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!