From: Adam Sutton <dev@adamsutton.me.uk>
Date: Thu, 4 Apr 2013 14:46:46 +0000 (+0100)
Subject: Fix #1679 - correct mistake in previous changes to stop constant IO
X-Git-Tag: 3.4beta5~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4af6cbef6046adf091505e4a7867aba22ad7360f;p=thirdparty%2Ftvheadend.git

Fix #1679 - correct mistake in previous changes to stop constant IO

TSID was not being properly updated, which could result in missing
services.
(cherry picked from commit 8bceacd96966211eddbd5cb1784e0f3864451483)
---

diff --git a/src/dvb/dvb_multiplex.c b/src/dvb/dvb_multiplex.c
index 692ebf1bd..f9985fd0e 100644
--- a/src/dvb/dvb_multiplex.c
+++ b/src/dvb/dvb_multiplex.c
@@ -882,6 +882,8 @@ dvb_mux_set_tsid(th_dvb_mux_instance_t *tdmi, uint16_t tsid, int force)
   if (tdmi->tdmi_transport_stream_id == tsid)
     return;
 
+  tdmi->tdmi_transport_stream_id = tsid;
+
   dvb_mux_save(tdmi);
 
   m = htsmsg_create_map();
@@ -898,7 +900,7 @@ dvb_mux_set_onid(th_dvb_mux_instance_t *tdmi, uint16_t onid, int force)
 {
   htsmsg_t *m;
 
-  if (force)
+  if (!force)
     if (tdmi->tdmi_network_id != 0 || onid == 0)
       return;