service: handle tuner/service priority settings also for free input i…

…nstances, fixes #3948
tvheadend · Aug 21, 2016 · c53ee12 · c53ee12
1 parent 3de3244
commit c53ee12
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/service.c b/src/service.c
@@ -815,15 +815,17 @@ service_find_instance
 
   /* Already running? */
   TAILQ_FOREACH(si, sil, si_link)
-    if(si->si_s->s_status == SERVICE_RUNNING && si->si_error == 0) {
+    if (si->si_s->s_status == SERVICE_RUNNING && si->si_error == 0) {
       tvhtrace(LS_SERVICE, "return already running %p", si);
       return si;
     }
 
-  /* Forced */
-  TAILQ_FOREACH(si, sil, si_link)
-    if(si->si_weight < 0 && si->si_error == 0)
-      break;
+  /* Forced, handle priority settings */
+  si = NULL;
+  TAILQ_FOREACH(next, sil, si_link)
+    if (next->si_weight < 0 && next->si_error == 0)
+      if (si == NULL || next->si_prio > si->si_prio)
+        si = next;
 
   /* Idle */
   if (!si) {