]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
epggrab: fixes for latest changes (unitialized tailq, wrong condition variable)
authorJaroslav Kysela <perex@perex.cz>
Sun, 17 Dec 2017 17:37:21 +0000 (18:37 +0100)
committerJaroslav Kysela <perex@perex.cz>
Mon, 18 Dec 2017 08:39:10 +0000 (09:39 +0100)
src/epggrab.c
src/epggrab/module.c

index e0c1bff604b0d6e018e1754c3a4dd6bc8d710e99..86e8199a9b334c406dfed3792f3bf8c1ebca98a3 100644 (file)
@@ -171,7 +171,7 @@ static void *_epggrab_data_thread( void *aux )
       }
       if (eq == NULL) {
         while (atomic_get(&epggrab_running))
-          pthread_cond_wait(&epggrab_cond, &epggrab_data_mutex);
+          pthread_cond_wait(&epggrab_data_cond, &epggrab_data_mutex);
       }
     } while (eq == NULL && atomic_get(&epggrab_running));
     pthread_mutex_unlock(&epggrab_data_mutex);
index 978e5e4b79f7ba49d7394842c25d2df3bfe92ea0..8a84c758c2bb57b5684a5fb8f8dd36396b21c2a9 100644 (file)
@@ -334,6 +334,7 @@ epggrab_module_t *epggrab_module_create
   skel->name     = strdup(name);
   skel->priority = priority;
   RB_INIT(&skel->channels);
+  TAILQ_INIT(&skel->data_queue);
 
   /* Insert */
   assert(!epggrab_module_find_by_id(id));