Merge remote-tracking branch 'tuxbox/master'

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
653 changed files with 2136 additions and 2008 deletions

View File

@@ -1226,7 +1226,7 @@ static void commandReadSIfromXML(int connfd, char *data, const unsigned dataLeng
writeLockMessaging();
data[dataLength] = '\0';
epg_dir = (std::string)data + "/";
static std::string epg_dir_tmp = (std::string)data + "/";
unlockMessaging();
@@ -1234,7 +1234,7 @@ static void commandReadSIfromXML(int connfd, char *data, const unsigned dataLeng
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
if (pthread_create (&thrInsert, &attr, insertEventsfromFile, (void *)epg_dir.c_str() ))
if (pthread_create (&thrInsert, &attr, insertEventsfromFile, (void *)epg_dir_tmp.c_str() ))
{
perror("sectionsd: pthread_create()");
}