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

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

Browse Source 
Origin commit data
------------------
Commit: 6e4c63f289
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-13 (Fri, 13 Jan 2017)
This commit is contained in:
vanhofen
2017-01-13 13:27:49 +01:00
parent 8c27915df5 9633f60a76
commit 9f8048b3d1
37 changed files with 177 additions and 107 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;
}
//------------------------------------------------------------