From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Tue, 3 Apr 2012 12:33:21 +0000 (+0200)
Subject: cec: don't send an active source command when the physical address couldn't be set... 
X-Git-Tag: upstream/2.2.0~1^2~31^2~19
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=1bfdc9bd15dc0056dedac3e9425edd4b2d25a96a;p=deb_libcec.git

cec: don't send an active source command when the physical address couldn't be set, or it might confuse other CEC devices
---

diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index 59a537f..ee95cce 100644
--- a/src/lib/CECProcessor.cpp
+++ b/src/lib/CECProcessor.cpp
@@ -253,7 +253,7 @@ bool CCECProcessor::Initialise(void)
   else if (m_configuration.iPhysicalAddress == 0 && (bReturn = SetHDMIPort(m_configuration.baseDevice, m_configuration.iHDMIPort, true)) == false)
     CLibCEC::AddLog(CEC_LOG_ERROR, "unable to set HDMI port %d on %s (%x)", m_configuration.iHDMIPort, ToString(m_configuration.baseDevice), (uint8_t)m_configuration.baseDevice);
 
-  if (m_configuration.bActivateSource == 1)
+  if (bReturn && m_configuration.bActivateSource == 1)
     m_busDevices[m_configuration.logicalAddresses.primary]->ActivateSource();
 
   SetInitialised(bReturn);