cec: try to set the other settings of one fails. bugzid: 543

diff --git a/src/lib/adapter/USBCECAdapterCommunication.cpp b/src/lib/adapter/USBCECAdapterCommunication.cpp
index 4e6189cee7aab847a54451082da7b2a4756598b7..4f477b90d6cfa9df43e29958d6f98bea92d43c4f 100644 (file)
--- a/src/lib/adapter/USBCECAdapterCommunication.cpp
+++ b/src/lib/adapter/USBCECAdapterCommunication.cpp
@@ -574,13 +574,16 @@ bool CUSBCECAdapterCommunication::PersistConfiguration(libcec_configuration *con
   if (m_iFirmwareVersion < 2)
     return false;
 
-  return SetAutoEnabled(true) &&
-      SetDefaultLogicalAddress(configuration->logicalAddresses.primary) &&
-      SetLogicalAddressMask(configuration->logicalAddresses.AckMask()) &&
-      SetPhysicalAddress(configuration->iPhysicalAddress) &&
-      SetCECVersion(CEC_VERSION_1_3A) &&
-      SetOSDName(configuration->strDeviceName) &&
-      WriteEEPROM();
+  bool bReturn(true);
+  bReturn &= SetAutoEnabled(true);
+  bReturn &= SetDefaultLogicalAddress(configuration->logicalAddresses.primary);
+  bReturn &= SetLogicalAddressMask(configuration->logicalAddresses.AckMask());
+  bReturn &= SetPhysicalAddress(configuration->iPhysicalAddress);
+  bReturn &= SetCECVersion(CEC_VERSION_1_3A);
+  bReturn &= SetOSDName(configuration->strDeviceName);
+  if (bReturn)
+    bReturn = WriteEEPROM();
+  return bReturn;
 }
 
 bool CUSBCECAdapterCommunication::SetControlledMode(bool controlled)