From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 6 Apr 2017 15:53:40 +0000 (+0200)
Subject: service: fix the 'service switch' streaming option
X-Git-Tag: v4.2.1~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a714655884741457e9729bdafc91c6752550a2a2;p=thirdparty%2Ftvheadend.git

service: fix the 'service switch' streaming option
---

diff --git a/src/service.c b/src/service.c
index d875b334d..37754c2f1 100644
--- a/src/service.c
+++ b/src/service.c
@@ -747,10 +747,9 @@ service_find_instance
   TAILQ_FOREACH(si, sil, si_link) {
     si->si_mark = 1;
     if (flags & SUBSCRIPTION_SWSERVICE) {
-      for (next = TAILQ_NEXT(si, si_link); next;
-           next = TAILQ_NEXT(next, si_link))
-        if (si->si_s == next->si_s && si->si_error)
-          next->si_error = si->si_error;
+      TAILQ_FOREACH(next, sil, si_link)
+        if (next != si && si->si_s == next->si_s && si->si_error)
+          next->si_error = MAX(next->si_error, si->si_error);
     }
   }