@@ -537,16 +537,39 @@ bouquet_add_service(bouquet_t *bq, service_t *s, uint64_t lcn, const char *tag)
537537static void
538538bouquet_unmap_channel (bouquet_t * bq , service_t * t )
539539{
540- idnode_list_mapping_t * ilm , * ilm_next ;
540+ idnode_list_mapping_t * ilm , * ilm_next , * ilm2 ;
541+ int delchannel ;
542+ channel_t * ch ;
543+ service_t * chsvc ;
541544
542545 ilm = LIST_FIRST (& t -> s_channels );
543546 while (ilm ) {
544547 ilm_next = LIST_NEXT (ilm , ilm_in1_link );
545- if (((channel_t * )ilm -> ilm_in2 )-> ch_bouquet == bq ) {
548+ ch = (channel_t * )ilm -> ilm_in2 ;
549+ if (ch -> ch_bouquet == bq ) {
550+ delchannel = 1 ;
546551 tvhinfo (LS_BOUQUET , "%s / %s: unmapped from %s" ,
547- channel_get_name (( channel_t * ) ilm -> ilm_in2 , channel_blank_name ),
552+ channel_get_name (ch , channel_blank_name ),
548553 t -> s_nicename , bq -> bq_name ?: "<unknown>" );
549- channel_delete ((channel_t * )ilm -> ilm_in2 , 1 );
554+
555+ // are any other (maybe merged) services from the same bouquet mapped to this channel
556+ LIST_FOREACH (ilm2 , & ch -> ch_services , ilm_in2_link ) {
557+ chsvc = (service_t * )ilm2 -> ilm_in1 ;
558+ if (& chsvc -> s_id != & t -> s_id && idnode_set_exists (bq -> bq_services , & chsvc -> s_id )) {
559+ tvhdebug (LS_BOUQUET , "Service: %s is also linked to %s and was mapped from the same bouquet: %s" ,
560+ chsvc -> s_nicename , channel_get_name (ch , channel_blank_name ),
561+ bq -> bq_name ?: "<unknown>" );
562+ delchannel = 0 ;
563+ }
564+ }
565+
566+ if (delchannel )
567+ channel_delete (ch , 1 );
568+ else {
569+ tvhinfo (LS_BOUQUET , "Skipped deleting %s as other services are mapped from the same bouquet: %s" ,
570+ channel_get_name (ch , channel_blank_name ), bq -> bq_name ?: "<unknown>" );
571+ idnode_list_unlink (ilm , ch );
572+ }
550573 }
551574 ilm = ilm_next ;
552575 }
0 commit comments