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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/streaminfo2.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: cc07333926
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-30 (Fri, 30 Dec 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-12-30 08:25:42 +01:00
parent d29073980f 3306c94002
commit 74cd77abb1
5 changed files with 19 additions and 21 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;