mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-01 09:51:13 +02:00
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e4c63f289
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-13 (Fri, 13 Jan 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -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()");
|
||||
}
|
||||
|
Reference in New Issue
Block a user