mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 02:11:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2733e0f260
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-02 (Mon, 02 Jan 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-01-02 23:55:23 +01:00
parent 45d33bdf00 90b59d60d3
commit f2b271a823
63 changed files with 172 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/timerd/timermanager.cpp
View File

@@ -821,7 +821,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;