From edab6137b837014d85aedc0fd73e6863ca4478cd Mon Sep 17 00:00:00 2001
From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Tue, 1 Nov 2011 21:50:23 +0100
Subject: [PATCH] cec: only mark error messages as error when waiting for
 transmit_succeeded

---
 src/lib/CECProcessor.cpp | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index cab483f..e24d812 100644
--- a/src/lib/CECProcessor.cpp
+++ b/src/lib/CECProcessor.cpp
@@ -298,29 +298,24 @@ bool CCECProcessor::WaitForTransmitSucceeded(uint8_t iLength, uint32_t iTimeout
       continue;
     }
 
-    bError = msg.is_error();
-    m_controller->AddLog(msg.is_error() ? CEC_LOG_WARNING : CEC_LOG_DEBUG, msg.ToString());
-
-    switch(msg.message())
+    if ((bError = msg.is_error()) == false)
     {
-    case MSGCODE_COMMAND_ACCEPTED:
-      if (iPacketsLeft > 0)
-        iPacketsLeft--;
-      break;
-    case MSGCODE_TRANSMIT_SUCCEEDED:
-      bTransmitSucceeded = (iPacketsLeft == 0);
-      bError = !bTransmitSucceeded;
-      break;
-    default:
-      CStdString strLog;
-      strLog.Format("received unexpected reply '%s' instead of ack", msg.MessageCodeAsString().c_str());
-      m_controller->AddLog(CEC_LOG_WARNING, strLog);
-      ParseMessage(msg);
-      bError = true;
-      break;
-    }
+      switch(msg.message())
+      {
+      case MSGCODE_COMMAND_ACCEPTED:
+        if (iPacketsLeft > 0)
+          iPacketsLeft--;
+        break;
+      case MSGCODE_TRANSMIT_SUCCEEDED:
+        bTransmitSucceeded = (iPacketsLeft == 0);
+        bError = !bTransmitSucceeded;
+        break;
+      default:
+        ParseMessage(msg);
+      }
 
-    iNow = GetTimeMs();
+      iNow = GetTimeMs();
+    }
   }
 
   return bTransmitSucceeded && !bError;
-- 
2.34.1