From 39a2272b56fd6faeabf766b31e6c1c2b3d3b5f91 Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Sat, 19 Jan 2013 23:24:16 +0000 Subject: [PATCH] Fix #1524 - webui: ignore mux updates from different adapter. These were causing the store to be unecessarily reloaded and as a result the enabled flag would get cleared in the middle of editing. --- src/dvb/dvb_multiplex.c | 2 ++ src/webui/static/app/dvb.js | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/dvb/dvb_multiplex.c b/src/dvb/dvb_multiplex.c index 37d3ca17..9341988d 100644 --- a/src/dvb/dvb_multiplex.c +++ b/src/dvb/dvb_multiplex.c @@ -1010,6 +1010,8 @@ dvb_mux_build_msg(th_dvb_mux_instance_t *tdmi) htsmsg_t *m = htsmsg_create_map(); char buf[100]; + htsmsg_add_str(m, "adapterId", tdmi->tdmi_adapter->tda_identifier); + htsmsg_add_str(m, "id", tdmi->tdmi_identifier); htsmsg_add_u32(m, "enabled", tdmi->tdmi_enabled); htsmsg_add_str(m, "network", tdmi->tdmi_network ?: ""); diff --git a/src/webui/static/app/dvb.js b/src/webui/static/app/dvb.js index 4ef9063e..5710640a 100644 --- a/src/webui/static/app/dvb.js +++ b/src/webui/static/app/dvb.js @@ -120,6 +120,9 @@ tvheadend.dvb_muxes = function(adapterData, satConfStore) { tvheadend.comet.on('dvbMux', function(m) { + if(m.adapterId !== adapterId) + return; + r = store.getById(m.id) if (typeof r === 'undefined') { store.reload();