X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fadapter%2FPulse-Eight%2FUSBCECAdapterCommunication.cpp;h=1be07c51fbb385e224a7fa5ec1ff0c2cb40515f9;hb=9be2206f155d4cff55d816e80d6275844cc33b3b;hp=2e9c790a7342cce914c28eb29c4e8ba031c33712;hpb=f7539eaf1ed0a488c0a93998c9b178d435014c51;p=deb_libcec.git

diff --git a/src/lib/adapter/Pulse-Eight/USBCECAdapterCommunication.cpp b/src/lib/adapter/Pulse-Eight/USBCECAdapterCommunication.cpp
index 2e9c790..1be07c5 100644
--- a/src/lib/adapter/Pulse-Eight/USBCECAdapterCommunication.cpp
+++ b/src/lib/adapter/Pulse-Eight/USBCECAdapterCommunication.cpp
@@ -304,6 +304,7 @@ bool CUSBCECAdapterCommunication::HandlePoll(const CCECAdapterMessage &msg)
     m_lastPollDestination = msg.Destination();
     if (msg.Destination() < CECDEVICE_BROADCAST)
     {
+      CLockObject waitingLock(m_waitingMutex);
       if (!m_bWaitingForAck[msg.Destination()] && !msg.IsEOM())
       {
         if (m_callback)
@@ -328,7 +329,7 @@ void CUSBCECAdapterCommunication::MarkAsWaiting(const cec_logical_address dest)
   /* mark as waiting for an ack from the destination */
   if (dest < CECDEVICE_BROADCAST)
   {
-    CLockObject lock(m_mutex);
+    CLockObject waitingLock(m_waitingMutex);
     m_bWaitingForAck[dest] = true;
   }
 }
@@ -709,7 +710,7 @@ void *CAdapterPingThread::Process(void)
       /* send a ping to the adapter */
       bool bPinged(false);
       int iFailedCounter(0);
-      while (!bPinged && iFailedCounter < 3)
+      while (!bPinged && iFailedCounter < 3 && !IsStopped())
       {
         if (!m_com->PingAdapter())
         {
@@ -723,7 +724,7 @@ void *CAdapterPingThread::Process(void)
         }
       }
 
-      if (iFailedCounter == 3)
+      if (iFailedCounter == 3 && !IsStopped())
       {
         /* failed to ping the adapter 3 times in a row. something must be wrong with the connection */
         m_com->LIB_CEC->AddLog(CEC_LOG_ERROR, "failed to ping the adapter 3 times in a row. closing the connection.");