cec: don't request the firmware version when the adapter didn't respond to a ping
authorLars Op den Kamp <lars@opdenkamp.eu>
Wed, 25 Jan 2012 18:43:41 +0000 (19:43 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Wed, 25 Jan 2012 18:43:41 +0000 (19:43 +0100)
src/lib/CECProcessor.cpp

index a8c4a5daf20b0135af081e60c0fca66637120a28..7ece12ae1412293297f3ba12859a5e38afab94a0 100644 (file)
@@ -153,11 +153,14 @@ bool CCECProcessor::OpenConnection(const char *strPort, uint16_t iBaudRate, uint
   if ((bReturn = m_communication->PingAdapter()) == false)
     CLibCEC::AddLog(CEC_LOG_ERROR, "the adapter does not respond correctly");
 
-  uint16_t iFirmwareVersion = m_communication->GetFirmwareVersion();
-  if ((bReturn = (iFirmwareVersion != CEC_FW_VERSION_UNKNOWN)) == false)
-    m_controller->AddLog(CEC_LOG_ERROR, "the adapter is running an unknown firmware version");
+  if (bReturn)
+  {
+    uint16_t iFirmwareVersion = m_communication->GetFirmwareVersion();
+    if ((bReturn = (iFirmwareVersion != CEC_FW_VERSION_UNKNOWN)) == false)
+      m_controller->AddLog(CEC_LOG_ERROR, "the adapter is running an unknown firmware version");
 
-  CLibCEC::AddLog(CEC_LOG_NOTICE, "CEC Adapter firmware version: %d", iFirmwareVersion);
+    CLibCEC::AddLog(CEC_LOG_NOTICE, "CEC Adapter firmware version: %d", iFirmwareVersion);
+  }
 
   return bReturn;
 }