Changed service_mapper_notify() origin==NULL behaviour

This commit is contained in:
Jaroslav Kysela 2014-03-17 10:37:27 +01:00
parent d619a12b59
commit d9de1e8674
2 changed files with 5 additions and 3 deletions

View file

@ -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);
}

View file

@ -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
*/