From: Jaroslav Kysela <perex@perex.cz>
Date: Sun, 15 Feb 2015 19:19:36 +0000 (+0100)
Subject: mpegts: linked tuner - do not crash when the linked tuner cannot be started, fixes... 
X-Git-Tag: v4.1~353
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=379672a6fb6f77cdbb80c4be00a6664265cbf634;p=thirdparty%2Ftvheadend.git

mpegts: linked tuner - do not crash when the linked tuner cannot be started, fixes #2678
---

diff --git a/src/input/mpegts/mpegts_mux.c b/src/input/mpegts/mpegts_mux.c
index 8ced5871f..82ef9dcfc 100644
--- a/src/input/mpegts/mpegts_mux.c
+++ b/src/input/mpegts/mpegts_mux.c
@@ -156,8 +156,7 @@ mpegts_mux_subscribe_linked
 
   mmi2 = LIST_FIRST(&mi2->mi_mux_active);
   if (mmi2) {
-    r = mpegts_mux_subscribe_keep(mmi2->mmi_mux, mi2);
-    if (!r)
+    if (!mpegts_mux_subscribe_keep(mmi2->mmi_mux, mi2))
       return;
     serr = "active2";
     goto fatal;
@@ -185,7 +184,6 @@ fatal:
   mi ->mi_display_name(mi,  buf1, sizeof(buf1));
   mi2->mi_display_name(mi2, buf2, sizeof(buf2));
   tvherror("mpegts", "%s - %s - linked input cannot be started (%s: %i)", buf1, buf2, serr, r);
-  abort();
 }
 
 void