mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-18 11:38:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone

Browse source
This commit is contained in:
Jehan Monnier 2010-09-13 09:38:42 +02:00
commit 95848cb397
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
coreapi/callbacks.c
View file

@ -97,6 +97,7 @@ static void call_received(SalOp *h){
/* play the ring if this is the only call*/
if (lc->sound_conf.ring_sndcard!=NULL && ms_list_size(lc->calls)==1){
lc->current_call=call;
if (lc->ringstream && lc->dmfs_playing_start_time!=0){
ring_stop(lc->ringstream);
lc->ringstream=NULL;

2
coreapi/linphonecore.c
View file

@ -2118,7 +2118,7 @@ int linphone_core_accept_call(LinphoneCore *lc, LinphoneCall *call)
call = (LinphoneCall*)linphone_core_get_calls(lc)->data;
}
if (lc->current_call){
if (lc->current_call!=NULL && lc->current_call!=call){
ms_warning("Cannot accept this call, there is already one running.");
return -1;
}