From: Scott <scott2.ware@gmail.com>
Date: Sun, 27 Apr 2014 17:44:32 +0000 (+0100)
Subject: Check manual priority of adapter before interface weighting so that priority settings... 
X-Git-Tag: v4.1~2112^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F383%2Fhead;p=thirdparty%2Ftvheadend.git

Check manual priority of adapter before interface weighting so that priority settings are obeyed.
---

diff --git a/src/service.c b/src/service.c
index fd765e794..7436c1c6a 100644
--- a/src/service.c
+++ b/src/service.c
@@ -1120,15 +1120,16 @@ service_refresh_channel(service_t *t)
 
 
 /**
- * Weight then prio?
+ * Priority Then Weight
  */
 static int
 si_cmp(const service_instance_t *a, const service_instance_t *b)
 {
   int r;
-  r = a->si_weight - b->si_weight;
+  r = a->si_prio - b->si_prio;
+
   if (!r)
-    r = a->si_prio - b->si_prio;
+    r = a->si_weight - b->si_weight;
   return r;
 }