From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 20 Mar 2019 13:47:02 +0000 (+0100)
Subject: linuxdvb: use the right configuration root for the slave tuners (loading), issue... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=453ee8dfd80b240e1005502c002bdc6de3f121c8;p=thirdparty%2Ftvheadend.git

linuxdvb: use the right configuration root for the slave tuners (loading), issue #5128
---

diff --git a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
index a7c38b516..3d589966b 100644
--- a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
@@ -2115,7 +2115,7 @@ linuxdvb_frontend_create
   const char *str, *uuid = NULL, *muuid = NULL;
   char id[16], lname[256], buf[256];
   linuxdvb_frontend_t *lfe;
-  htsmsg_t *scconf;
+  htsmsg_t *oconf = conf, *scconf;
   ssize_t r;
   int fd;
 
@@ -2129,7 +2129,8 @@ linuxdvb_frontend_create
   /* Tuner slave */
   snprintf(buf, sizeof(buf), "master for #%d", number);
   if (conf && type == DVB_TYPE_S) {
-    muuid = htsmsg_get_str(conf, buf);
+    /* use the original configuration here */
+    muuid = htsmsg_get_str(oconf, buf);
     if (muuid && uuid && !strcmp(muuid, uuid))
       muuid = NULL;
   }