From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 18 Mar 2016 10:32:19 +0000 (+0100)
Subject: network scan: sort muxes also by networks
X-Git-Tag: v4.2.1~840
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=850f8e46b3cf8a504227f3cb7030f689a682b05e;p=thirdparty%2Ftvheadend.git

network scan: sort muxes also by networks
---

diff --git a/src/input/mpegts/mpegts_network_scan.c b/src/input/mpegts/mpegts_network_scan.c
index 1bc1f9bea..45db6f358 100644
--- 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;