From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 17 Mar 2014 09:37:27 +0000 (+0100)
Subject: Changed service_mapper_notify() origin==NULL behaviour
X-Git-Tag: v4.1~2223^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F351%2Fhead;p=thirdparty%2Ftvheadend.git

Changed service_mapper_notify() origin==NULL behaviour
---

diff --git a/src/service_mapper.c b/src/service_mapper.c
index 364131be9..8f3ef301c 100644
--- a/src/service_mapper.c
+++ b/src/service_mapper.c
@@ -177,11 +177,13 @@ service_mapper_remove ( service_t *s )
 static void
 service_mapper_notify ( channel_service_mapping_t *csm, void *origin )
 {
-  if (origin == NULL || origin == csm->csm_svc) {
+  if (origin == NULL)
+    return;
+  if (origin == csm->csm_svc) {
     idnode_notify_simple(&csm->csm_chn->ch_id);
     channel_save(csm->csm_chn);
   }
-  if (origin == NULL || origin == csm->csm_chn)
+  if (origin == csm->csm_chn)
     idnode_notify_simple(&csm->csm_svc->s_id);
 }
 
diff --git a/src/service_mapper.h b/src/service_mapper.h
index 132249e73..43f23aef6 100644
--- a/src/service_mapper.h
+++ b/src/service_mapper.h
@@ -66,7 +66,7 @@ void service_mapper_unlink ( struct service *s, struct channel *c, void *origin
  * @param s       The service to clean linkages for
  * @param c       The channel to clean linkages for
  * @parma origin  Origin of the change (should be a service or a channel ptr).
- *                NULL = both changed, other ptr = no save and notifications.
+ *                NULL = no save and notifications.
  *
  * @return 1 if changes were made, else 0
  */