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

Merge remote-tracking branch 'tuxbox/master'

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: a409047714
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-22 (Sun, 22 Jan 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2017-01-22 22:59:39 +01:00
parent 3cbd0716f4 01bf84742d
commit d6861c1054
653 changed files with 2136 additions and 2008 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
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;
@@ -771,8 +771,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;
}
//------------------------------------------------------------
@@ -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;
@@ -1173,6 +1175,9 @@ CTimerEvent_Record::CTimerEvent_Record(time_t announce_Time, time_t alarm_Time,
eventInfo.epg_starttime = epg_starttime;
eventInfo.channel_id = channel_id;
eventInfo.apids = apids;
eventInfo.autoAdjustToEPG = _autoAdjustToEPG;
eventInfo.recordingSafety = _recordingSafety;
recordingDir = recDir;
epgTitle="";
autoAdjustToEPG = _autoAdjustToEPG;