From: Jaroslav Kysela <perex@perex.cz>
Date: Sun, 6 Mar 2016 19:05:36 +0000 (+0100)
Subject: mpegts service: do not touch multiplex for raw services (deferred destroy)
X-Git-Tag: v4.2.1~952
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ea81ab0156a90ee68ec67b49e85f9047197cbc0;p=thirdparty%2Ftvheadend.git

mpegts service: do not touch multiplex for raw services (deferred destroy)
---

diff --git a/src/input/mpegts/mpegts_service.c b/src/input/mpegts/mpegts_service.c
index 0a68abb6d..4bdc09592 100644
--- a/src/input/mpegts/mpegts_service.c
+++ b/src/input/mpegts/mpegts_service.c
@@ -663,9 +663,10 @@ void
 mpegts_service_delete ( service_t *t, int delconf )
 {
   mpegts_service_t *ms = (mpegts_service_t*)t, *mms;
-  mpegts_mux_t     *mm = ms->s_dvb_mux;
+  mpegts_mux_t     *mm = t->s_type == STYPE_STD ? ms->s_dvb_mux : NULL;
 
-  idnode_changed(&mm->mm_id);
+  if (mm)
+    idnode_changed(&mm->mm_id);
 
   /* Free memory */
   if (t->s_type == STYPE_STD)