mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 09:21:09 +02:00
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: eaf2fc204a
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-12-26 (Mon, 26 Dec 2016)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -1225,7 +1225,7 @@ static void commandReadSIfromXML(int connfd, char *data, const unsigned dataLeng
|
||||
|
||||
writeLockMessaging();
|
||||
data[dataLength] = '\0';
|
||||
epg_dir = (std::string)data + "/";
|
||||
std::string load_epg_dir = (std::string)data + "/";
|
||||
unlockMessaging();
|
||||
|
||||
|
||||
@@ -1233,7 +1233,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 *)load_epg_dir.c_str() ))
|
||||
{
|
||||
perror("sectionsd: pthread_create()");
|
||||
}
|
||||
|
Reference in New Issue
Block a user