subscription: fix the wrong raw service removal

tvheadend · Oct 18, 2015 · 00031a8 · 00031a8
1 parent 4cf71bb
commit 00031a8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/service.c b/src/service.c
@@ -305,7 +305,7 @@ void
 service_stop(service_t *t)
 {
   elementary_stream_t *st;
- 
+
   gtimer_disarm(&t->s_receive_timer);
 
   t->s_stop_feed(t);

diff --git a/src/subscriptions.c b/src/subscriptions.c
@@ -558,11 +558,13 @@ subscription_unsubscribe(th_subscription_t *s, int quiet)
   service_t *t;
   char buf[512];
   size_t l = 0;
+  service_t *raw;
 
   if (s == NULL)
     return;
 
   t = s->ths_service;
+  raw = s->ths_raw_service;
 
   lock_assert(&global_lock);
 
@@ -574,7 +576,7 @@ subscription_unsubscribe(th_subscription_t *s, int quiet)
   LIST_SAFE_REMOVE(s, ths_remove_link);
 
 #if ENABLE_MPEGTS
-  if (s->ths_raw_service)
+  if (raw)
     LIST_REMOVE(s, ths_mux_link);
 #endif
 
@@ -600,7 +602,7 @@ subscription_unsubscribe(th_subscription_t *s, int quiet)
   }
 
 #if ENABLE_MPEGTS
-  if (s->ths_raw_service)
+  if (raw)
     service_remove_raw(s->ths_raw_service);
 #endif