diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c index 00739ae95b80453a7f8fbd29611f010c4865f3c5..6e9e4c45cf63f60f34813cdaddf09d260f665d5a 100644 --- a/coreapi/linphonecall.c +++ b/coreapi/linphonecall.c @@ -673,7 +673,7 @@ void linphone_call_start_media_streams(LinphoneCall *call){ video_stream_enable_self_view(call->videostream,lc->video_conf.selfview); if (stream->dir==SalStreamSendOnly && lc->video_conf.capture ){ - cam=ms_web_cam_manager_get_cam(ms_web_cam_manager_get(),"Static picture"); + cam=ms_web_cam_manager_get_cam(ms_web_cam_manager_get(),"StaticImage: Static picture"); dir=VideoStreamSendOnly; }else if (stream->dir==SalStreamRecvOnly && lc->video_conf.display ){ dir=VideoStreamRecvOnly; diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 3476a4fe4ae4dc21ad4c84f66e0d691fc492213a..9353a7fc57e2ba4013a92c1e6d59b32715261f6a 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -2133,7 +2133,7 @@ int linphone_core_accept_call(LinphoneCore *lc, LinphoneCall *call) MSList *elem; for(elem=lc->calls;elem!=NULL;elem=elem->next){ LinphoneCall *c=(LinphoneCall*)elem->data; - if (c!=call && (c->state!=LinphoneCallPaused)){ + if (c!=call && (c->state!=LinphoneCallPaused && c->state!=LinphoneCallPausing)){ ms_warning("Cannot accept this call as another one is running, pause it before."); return -1; } @@ -2333,10 +2333,12 @@ int linphone_core_resume_call(LinphoneCore *lc, LinphoneCall *the_call) return -1; } if(linphone_core_get_current_call(lc) != NULL){ + ms_warning("There is already a call in process, pause or stop it first."); if (lc->vtable.display_warning) lc->vtable.display_warning(lc,_("There is already a call in process, pause or stop it first.")); return -1; } + ms_message("Resuming call %p",call); if(sal_call_hold(call->op,FALSE) != 0){ return -1; }