From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Tue, 14 May 2013 23:15:22 +0000 (+0200)
Subject: fixed possible crash when the tv does not respond to polls and the client isn't regis... 
X-Git-Tag: upstream/2.2.0~1^2~3^2~44
X-Git-Url: https://git.piment-noir.org/?p=deb_libcec.git;a=commitdiff_plain;h=dad75c6cfa3c1a1c12eeca10190f14831c435325

fixed possible crash when the tv does not respond to polls and the client isn't registered yet. don't poll the tv in monitoring mode. closes #163 and fogbugz ticket
---

diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index a44b81e..6749170 100644
--- a/src/lib/CECProcessor.cpp
+++ b/src/lib/CECProcessor.cpp
@@ -245,12 +245,17 @@ void *CCECProcessor::Process(void)
       // check whether the TV is present and responding
       if (tvPresentCheck.TimeLeft() == 0)
       {
-        if (!m_busDevices->At(CECDEVICE_TV)->IsPresent())
+        CCECClient *primary = GetPrimaryClient();
+        // only check whether the tv responds to polls when a client is connected and not in monitoring mode
+        if (primary && primary->GetConfiguration()->bMonitorOnly != 1)
         {
-          libcec_parameter param;
-          param.paramType = CEC_PARAMETER_TYPE_STRING;
-          param.paramData = (void*)"TV does not respond to CEC polls";
-          GetPrimaryClient()->Alert(CEC_ALERT_TV_POLL_FAILED, param);
+          if (!m_busDevices->At(CECDEVICE_TV)->IsPresent())
+          {
+            libcec_parameter param;
+            param.paramType = CEC_PARAMETER_TYPE_STRING;
+            param.paramData = (void*)"TV does not respond to CEC polls";
+            primary->Alert(CEC_ALERT_TV_POLL_FAILED, param);
+          }
         }
         tvPresentCheck.Init(TV_PRESENT_CHECK_INTERVAL);
       }