From 5de67222b21bd01412ab4a4ef050b07aaa0f24c6 Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Thu, 15 Mar 2012 12:05:00 +0100 Subject: [PATCH] cec: m_iLineTimeout was never initialised and used. fixes MSGCODE_REJECTED when transmitting a message and incorrect line timeouts being used --- src/lib/CECProcessor.cpp | 2 +- src/lib/CECProcessor.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp index 1f46782..a421840 100644 --- a/src/lib/CECProcessor.cpp +++ b/src/lib/CECProcessor.cpp @@ -892,7 +892,7 @@ bool CCECProcessor::Transmit(const cec_command &data) iMaxTries = m_busDevices[data.initiator]->GetHandler()->GetTransmitRetries() + 1; } - return m_communication->Write(data, iMaxTries, m_iLineTimeout, m_iRetryLineTimeout) + return m_communication->Write(data, iMaxTries, m_iStandardLineTimeout, m_iRetryLineTimeout) == ADAPTER_MESSAGE_STATE_SENT_ACKED; } diff --git a/src/lib/CECProcessor.h b/src/lib/CECProcessor.h index 4c877e5..d280844 100644 --- a/src/lib/CECProcessor.h +++ b/src/lib/CECProcessor.h @@ -170,7 +170,6 @@ namespace CEC bool m_bMonitor; cec_keypress m_previousKey; PLATFORM::CThread * m_busScan; - uint8_t m_iLineTimeout; uint8_t m_iStandardLineTimeout; uint8_t m_iRetryLineTimeout; uint64_t m_iLastTransmission; -- 2.34.1