From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 18 Oct 2018 18:43:20 +0000 (+0200)
Subject: dvb psi: fix for the previous commits - move pmt monitor change to mpegts_service_find()
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddfbf14888a4ed13ddd134452e43ad2dab71d67e;p=thirdparty%2Ftvheadend.git

dvb psi: fix for the previous commits - move pmt monitor change to mpegts_service_find()
---

diff --git a/src/input/mpegts/dvb_psi.c b/src/input/mpegts/dvb_psi.c
index 57ef4badc..e04d2df6c 100644
--- a/src/input/mpegts/dvb_psi.c
+++ b/src/input/mpegts/dvb_psi.c
@@ -1017,8 +1017,6 @@ dvb_pat_callback
                          NULL, "pmt", LS_TBL_BASE,
                          MT_CRC | MT_QUICKREQ | MT_ONESHOT | MT_SCANSUBS,
                          pid, MPS_WEIGHT_PMT_SCAN);
-        if (s->s_pmt_mon && (save & 2) != 0) /* PMT PID change? */
-          mpegts_input_open_pmt_monitor(mm, s);
         if (save)
           service_request_save((service_t*)s);
       }
diff --git a/src/input/mpegts/mpegts_service.c b/src/input/mpegts/mpegts_service.c
index a04686fda..aa175395c 100644
--- a/src/input/mpegts/mpegts_service.c
+++ b/src/input/mpegts/mpegts_service.c
@@ -922,7 +922,9 @@ mpegts_service_find
     if (service_id16(s) == sid) {
       if (pmt_pid && pmt_pid != s->s_components.set_pmt_pid) {
         s->s_components.set_pmt_pid = pmt_pid;
-        if (save) *save = 3;
+        if (s->s_pmt_mon)
+          mpegts_input_open_pmt_monitor(mm, s);
+        if (save) *save = 1;
       }
       if (create) {
         if ((save && *save) || s->s_dvb_last_seen + 3600 < gclk()) {