From 321c1d7fd919ad384206b90436a292f7cdb2e657 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 6 Jan 2016 10:51:32 +0100 Subject: [PATCH] fix make dist and null pointer when rtt is disabled --- coreapi/Makefile.am | 2 +- coreapi/linphonecall.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am index dd643a1b0..d9ce1d1f4 100644 --- a/coreapi/Makefile.am +++ b/coreapi/Makefile.am @@ -90,7 +90,7 @@ liblinphone_la_SOURCES=\ xml.c \ xmlrpc.c \ vtables.c \ - ringtoneplayer.c \ + ringtoneplayer.c ringtoneplayer.h\ $(GITVERSION_FILE) if BUILD_UPNP diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c index b7876e964..184eccb1c 100644 --- a/coreapi/linphonecall.c +++ b/coreapi/linphonecall.c @@ -2483,7 +2483,7 @@ void linphone_call_init_text_stream(LinphoneCall *call){ LinphoneCore *lc=call->core; char* cname; - if (call->textstream != NULL || !call->params->realtimetext_enabled) return; + if (call->textstream != NULL) return; if (call->sessions[call->main_text_stream_index].rtp_session == NULL) { SalMulticastRole multicast_role = linphone_call_get_multicast_role(call, SalText); SalMediaDescription *remotedesc = NULL;