From: Adam Sutton <dev@adamsutton.me.uk>
Date: Thu, 5 Sep 2013 14:14:41 +0000 (+0100)
Subject: epggrab: change order of init to ensure things work properly
X-Git-Tag: v4.1~2561
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d9b710ecf93bb4c18a4d43b8360d69355cc4e83f;p=thirdparty%2Ftvheadend.git

epggrab: change order of init to ensure things work properly
---

diff --git a/src/epggrab.c b/src/epggrab.c
index 3e13a4f5a..b421b2609 100644
--- a/src/epggrab.c
+++ b/src/epggrab.c
@@ -378,18 +378,9 @@ void epggrab_init ( void )
   epggrab_channel_reicon     = 0;
   epggrab_epgdb_periodicsave = 0;
 
-  /* Lists */
-#if 0//ENABLE_LINUXDVB
-  extern TAILQ_HEAD(, epggrab_ota_mux) ota_mux_all;
-  TAILQ_INIT(&ota_mux_all);
-#endif
-
   pthread_mutex_init(&epggrab_mutex, NULL);
   pthread_cond_init(&epggrab_cond, NULL);
 
-  /* Initialise the OTA subsystem */
-  epggrab_ota_init();
-  
   /* Initialise modules */
 #if ENABLE_MPEGTS
   eit_init();
@@ -398,11 +389,11 @@ void epggrab_init ( void )
   pyepg_init();
   xmltv_init();
 
+  /* Initialise the OTA subsystem */
+  epggrab_ota_init();
+  
   /* Load config */
   _epggrab_load();
-#if 0//ENABLE_LINUXDVB
-  epggrab_ota_load();
-#endif
 
   /* Start internal grab thread */
   pthread_t      tid;