service: fix mistake causing service startup to report incorrectly.

This commit is contained in:
Adam Sutton 2013-04-30 15:10:45 +01:00
parent c336c012eb
commit 44f20713db
2 changed files with 4 additions and 1 deletions

View file

@ -295,7 +295,7 @@ service_find_instance(channel_t *ch, struct service_instance_list *sil,
}
service_start(si->si_s, si->si_instance);
return NULL;
return si;
}

View file

@ -180,6 +180,7 @@ subscription_reschedule(void)
time(&si->si_error_time);
}
tvhtrace("subscription", "find service for %s weight %d", s->ths_channel->ch_name, s->ths_weight);
si = service_find_instance(s->ths_channel, &s->ths_instances, &error,
s->ths_weight);
s->ths_current_instance = si;
@ -377,6 +378,8 @@ subscription_create_from_channel(channel_t *ch, unsigned int weight,
{
th_subscription_t *s;
tvhtrace("subscription", "creating subscription for %s weight %d",
ch->ch_name, weight);
s = subscription_create(weight, name, st, flags, subscription_input,
hostname, username, client);