From ffdfabf02d6647c1745e3c92e7514c776d84c468 Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Thu, 8 Mar 2012 18:30:49 +0100 Subject: [PATCH] cec: try to set the other settings of one fails. bugzid: 543 --- src/lib/adapter/USBCECAdapterCommunication.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/lib/adapter/USBCECAdapterCommunication.cpp b/src/lib/adapter/USBCECAdapterCommunication.cpp index 4e6189c..4f477b9 100644 --- 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) -- 2.34.1