cec: persist the configuration before closing the connection. only try to persist...

diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index dee5f5949af2321acdfbb62a0682599014305d67..c1c999c34454d95e6f214a956f81ccc763287f8a 100644 (file)
--- a/src/lib/CECProcessor.cpp
+++ b/src/lib/CECProcessor.cpp
@@ -150,6 +150,7 @@ void CCECProcessor::Close(void)
 
   if (bClose && m_communication)
   {
+    m_communication->PersistConfiguration(&m_configuration);
     m_communication->Close();
     delete m_communication;
     m_communication = NULL;

diff --git a/src/lib/adapter/USBCECAdapterCommunication.cpp b/src/lib/adapter/USBCECAdapterCommunication.cpp
index 84a052dd302bab6c50b9b15dc5dc3fa0890ae9cb..4e6189cee7aab847a54451082da7b2a4756598b7 100644 (file)
--- a/src/lib/adapter/USBCECAdapterCommunication.cpp
+++ b/src/lib/adapter/USBCECAdapterCommunication.cpp
@@ -571,6 +571,9 @@ bool CUSBCECAdapterCommunication::SetAckMaskInternal(uint16_t iMask, bool bWrite
 
 bool CUSBCECAdapterCommunication::PersistConfiguration(libcec_configuration *configuration)
 {
+  if (m_iFirmwareVersion < 2)
+    return false;
+
   return SetAutoEnabled(true) &&
       SetDefaultLogicalAddress(configuration->logicalAddresses.primary) &&
       SetLogicalAddressMask(configuration->logicalAddresses.AckMask()) &&