From: E.Smith <31170571+azlm8t@users.noreply.github.com>
Date: Wed, 6 Sep 2017 19:41:50 +0000 (+0100)
Subject: eit: Clear scraper patterns on shutdown. (#4287).
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b52e448592db05262ae6f26ebe209f060ced869c;p=thirdparty%2Ftvheadend.git

eit: Clear scraper patterns on shutdown. (#4287).

Issue: #4287
---

diff --git a/src/epggrab/module/eit.c b/src/epggrab/module/eit.c
index 7f7a33797..7d9d0febb 100644
--- a/src/epggrab/module/eit.c
+++ b/src/epggrab/module/eit.c
@@ -86,7 +86,8 @@ typedef struct eit_event
  * Forward declarations
  */
 static void _eit_module_load_config(eit_module_t *mod);
-
+static void _eit_scrape_clear(eit_module_t *mod);
+static void _eit_done(void *mod);
 
 /* ************************************************************************
  * Diagnostics
@@ -912,8 +913,7 @@ static int _eit_activate(void *m, int e)
    * activated. This allows user to modify the config files and get
    * them re-read easily.
    */
-  eit_pattern_free_list(&mod->p_snum);
-  eit_pattern_free_list(&mod->p_enum);
+  _eit_scrape_clear(mod);
 
   mod->active = e;
 
@@ -960,6 +960,12 @@ static int _eit_tune
   return r;
 }
 
+static void _eit_scrape_clear(eit_module_t *mod)
+{
+  eit_pattern_free_list(&mod->p_snum);
+  eit_pattern_free_list(&mod->p_enum);
+}
+
 static int _eit_scrape_load_one ( htsmsg_t *m, eit_module_t* mod )
 {
     eit_pattern_compile_list(&mod->p_snum, htsmsg_get_list(m, "season_num"));
@@ -1039,6 +1045,7 @@ static eit_module_t *eit_module_ota_create
   }; \
   static epggrab_ota_module_ops_t name = { \
     .start  = _eit_start, \
+    .done = _eit_done, \
     .activate = _eit_activate, \
     .tune   = _eit_tune, \
     .opaque = &opaque_##name, \
@@ -1064,6 +1071,12 @@ void eit_init ( void )
   EIT_CREATE("Bulsatcom_39E", "Bulsatcom: Bula 39E", 5, &ops_bulsat);
 }
 
+void _eit_done ( void *m )
+{
+  eit_module_t *mod = m;
+  _eit_scrape_clear(mod);
+}
+
 void eit_done ( void )
 {
 }