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/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: eee55893c6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-05 (Thu, 05 Jan 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-01-05 23:07:16 +01:00
parent 90b59d60d3 51710a33b4
commit 2cd0bbb9f1
15 changed files with 93 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/timerd/timermanager.cpp
View File

@@ -723,7 +723,6 @@ bool CTimerManager::shutdown()
time_t nextAnnounceTime=0;
bool status=false;
timer_is_rec = false;
dprintf("stopping timermanager thread ...\n");
dprintf("Waiting for timermanager thread to terminate ...\n");
@@ -737,7 +736,8 @@ bool CTimerManager::shutdown()
saveEventsToConfig();
dprintf("shutdown: saved config\n");
}
if (pthread_mutex_trylock(&tm_eventsMutex) == EBUSY)
int rc = pthread_mutex_trylock(&tm_eventsMutex);
if (rc == EBUSY)
{
dprintf("error: mutex is still LOCKED\n");
return false;
@@ -772,8 +772,8 @@ bool CTimerManager::shutdown()
timer_minutes = (nextAnnounceTime - 3*60)/60;
}
dprintf("shutdown: timeset: %d timer_minutes %ld\n", timeset, timer_minutes);
pthread_mutex_unlock(&tm_eventsMutex);
if(rc == 0)
pthread_mutex_unlock(&tm_eventsMutex);
return status;
}
//------------------------------------------------------------