From 916a1aa5ff11673fc34748614a04bbf9c79d8be8 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Sun, 4 Feb 2018 10:41:44 +0100
Subject: [PATCH] eit: obvious fixes

---
 src/epggrab/module/eit.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/epggrab/module/eit.c b/src/epggrab/module/eit.c
index 89eb27b20..140532d51 100644
--- a/src/epggrab/module/eit.c
+++ b/src/epggrab/module/eit.c
@@ -1172,9 +1172,11 @@ static int _eit_tune
 static epggrab_ota_map_t *eit_find_epggrab_map(epggrab_ota_mux_t *om, int id)
 {
   epggrab_ota_map_t *map;
+  epggrab_module_ota_t *m;
 
   LIST_FOREACH(map, &om->om_modules, om_link) {
-    if (((eit_private_t *)(map->om_module)->opaque)->id == id)
+    m = map->om_module;
+    if (m->opaque && ((eit_private_t *)m->opaque)->id == id)
       return map;
   }
   return NULL;
@@ -1224,6 +1226,8 @@ void eit_nit_callback(mpegts_table_t *mt, uint16_t nbid, const char *name, uint3
       }
       return;
     }
+
+    break;
   }
 
   tvhtrace(m->subsys, "NIT - detected module '%s'", m->id);
-- 
2.47.3