From a71c48a9dbdc6c3b30fa0a98b050ea517f5cdc91 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Thu, 29 Dec 2016 16:18:13 +0100 Subject: [PATCH] src/timerd/timermanager.cpp fix double locking Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/e88eeb61cddd507936bf58646a61bd2b5f4a5474 Author: Jacek Jendrzej Date: 2016-12-29 (Thu, 29 Dec 2016) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/timerd/timermanager.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/timerd/timermanager.cpp b/src/timerd/timermanager.cpp index 4d3dddf78..e18e1612f 100644 --- a/src/timerd/timermanager.cpp +++ b/src/timerd/timermanager.cpp @@ -819,7 +819,9 @@ void CTimerManager::cancelShutdownOnWakeup() { pthread_mutex_lock(&tm_eventsMutex); if (shutdown_eventID > -1) { + pthread_mutex_unlock(&tm_eventsMutex); removeEvent(shutdown_eventID); + pthread_mutex_lock(&tm_eventsMutex); shutdown_eventID = -1; } wakeup = 0;