network scan: sort muxes also by networks

tvheadend · Mar 18, 2016 · 850f8e4 · 850f8e4
1 parent 3b913c6
commit 850f8e4
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/input/mpegts/mpegts_network_scan.c b/src/input/mpegts/mpegts_network_scan.c
@@ -36,6 +36,10 @@ mm_cmp ( mpegts_mux_t *a, mpegts_mux_t *b )
 {
   int r = b->mm_scan_weight - a->mm_scan_weight;
   if (r == 0) {
+    r = uuid_cmp(&a->mm_network->mn_id.in_uuid,
+                 &b->mm_network->mn_id.in_uuid);
+    if (r)
+      return r;
     if (idnode_is_instance(&a->mm_id, &dvb_mux_dvbs_class) &&
         idnode_is_instance(&b->mm_id, &dvb_mux_dvbs_class)) {
       dvb_mux_conf_t *mc1 = &((dvb_mux_t *)a)->lm_tuning;