From 67b9d205ea4e8520cfac7c2975ddf10de8f85d6e Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Sat, 11 Feb 2012 21:46:09 +0100 Subject: [PATCH] cec: don't try to lock the transmit mutex when deleting a command handler --- src/lib/devices/CECBusDevice.h | 1 + src/lib/implementations/CECCommandHandler.cpp | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/devices/CECBusDevice.h b/src/lib/devices/CECBusDevice.h index 60b293a..3de307d 100644 --- a/src/lib/devices/CECBusDevice.h +++ b/src/lib/devices/CECBusDevice.h @@ -141,6 +141,7 @@ namespace CEC std::set m_unsupportedFeatures; PLATFORM::CMutex m_mutex; PLATFORM::CMutex m_handlerMutex; + PLATFORM::CEvent m_replacing; unsigned m_iHandlerUseCount; bool m_bAwaitingReceiveFailed; }; diff --git a/src/lib/implementations/CECCommandHandler.cpp b/src/lib/implementations/CECCommandHandler.cpp index 8c18958..b8dd25f 100644 --- a/src/lib/implementations/CECCommandHandler.cpp +++ b/src/lib/implementations/CECCommandHandler.cpp @@ -57,8 +57,6 @@ CCECCommandHandler::CCECCommandHandler(CCECBusDevice *busDevice) : CCECCommandHandler::~CCECCommandHandler(void) { - CLockObject lock(m_processor->m_transmitMutex); - CLockObject receiveLock(m_receiveMutex); m_condition.Broadcast(); } -- 2.34.1