From 4af6cbef6046adf091505e4a7867aba22ad7360f Mon Sep 17 00:00:00 2001
From: Adam Sutton <dev@adamsutton.me.uk>
Date: Thu, 4 Apr 2013 15:46:46 +0100
Subject: [PATCH] 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)
---
 src/dvb/dvb_multiplex.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/dvb/dvb_multiplex.c b/src/dvb/dvb_multiplex.c
index 692ebf1b..f9985fd0 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;