From 3be28877df233539fb2231db8293016123186e83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20T=C3=B6rnblom?= Date: Thu, 9 Aug 2012 19:13:37 +0200 Subject: [PATCH] fixed segfault when using raw ts from file instead of a muxer. --- src/service.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/service.c b/src/service.c index 7db19fc0..1904530e 100644 --- a/src/service.c +++ b/src/service.c @@ -1036,13 +1036,19 @@ service_adapter_nicename(service_t *t) { switch(t->s_type) { case SERVICE_TYPE_DVB: - return t->s_dvb_mux_instance->tdmi_identifier; + if(t->s_dvb_mux_instance) + return t->s_dvb_mux_instance->tdmi_identifier; + else + return "Unknown adapter"; case SERVICE_TYPE_IPTV: - return t->s_iptv_iface; + return t->s_iptv_iface; case SERVICE_TYPE_V4L: - return t->s_v4l_adapter->va_displayname; + if(t->s_v4l_adapter) + return t->s_v4l_adapter->va_displayname; + else + return "Unknown adapter"; default: return "Unknown adapter";