mpegts: linked tuner - do not crash when the linked tuner cannot be s…

…tarted, fixes #2678
tvheadend · Feb 15, 2015 · 379672a · 379672a · piotrasd · Feb 15, 2015
1 parent 54533b3
commit 379672a
Showing 1 changed file with 1 addition and 3 deletions.
diff --git 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 @@ mpegts_mux_subscribe_linked
   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