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.

diff --git a/src/dvb/dvb_multiplex.c b/src/dvb/dvb_multiplex.c
index 37d3ca1721b43ee437eb961b1bde6802fa9ce245..9341988d652a0f7029740c740b6ea4f8270eddde 100644 (file)
--- 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 4ef9063ec8b9f071503802c14350f8112607ee6a..5710640aea225ca39931f036d15e6df77df32d94 100644 (file)
--- 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();