mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-03-13 20:50:41 +00:00
don't print pre-answer message if you pre answer after you answer
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16469 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
6c8f3519e4
commit
bbd8027e72
@ -1958,7 +1958,8 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_ring_ready(switch_ch
|
|||||||
char *app;
|
char *app;
|
||||||
switch_event_t *event;
|
switch_event_t *event;
|
||||||
|
|
||||||
if (!switch_channel_test_flag(channel, CF_RING_READY)) {
|
if (!switch_channel_test_flag(channel, CF_RING_READY) && !switch_channel_test_flag(channel, CF_EARLY_MEDIA &&
|
||||||
|
!switch_channel_test_flag(channel, CF_ANSWERED))) {
|
||||||
switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_channel_get_uuid(channel), SWITCH_LOG_NOTICE, "Ring-Ready %s!\n", channel->name);
|
switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_channel_get_uuid(channel), SWITCH_LOG_NOTICE, "Ring-Ready %s!\n", channel->name);
|
||||||
switch_channel_set_flag(channel, CF_RING_READY);
|
switch_channel_set_flag(channel, CF_RING_READY);
|
||||||
if (channel->caller_profile && channel->caller_profile->times) {
|
if (channel->caller_profile && channel->caller_profile->times) {
|
||||||
@ -2007,7 +2008,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_pre_answered(switch_
|
|||||||
const char *var = NULL;
|
const char *var = NULL;
|
||||||
char *app;
|
char *app;
|
||||||
|
|
||||||
if (!switch_channel_test_flag(channel, CF_EARLY_MEDIA)) {
|
if (!switch_channel_test_flag(channel, CF_EARLY_MEDIA) && !switch_channel_test_flag(channel, CF_ANSWERED)) {
|
||||||
const char *uuid;
|
const char *uuid;
|
||||||
switch_core_session_t *other_session;
|
switch_core_session_t *other_session;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user