Revision
16469
Author
anthm
Date
2010-01-22 15:04:50 -0600 (Fri, 22 Jan 2010)

Log Message

don't print pre-answer message if you pre answer after you answer

Modified Paths

Diff

Modified: freeswitch/trunk/src/switch_channel.c (16468 => 16469)


--- freeswitch/trunk/src/switch_channel.c	2010-01-22 20:51:23 UTC (rev 16468)
+++ freeswitch/trunk/src/switch_channel.c	2010-01-22 21:04:50 UTC (rev 16469)
@@ -1958,7 +1958,8 @@
 	char *app;
 	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_channel_set_flag(channel, CF_RING_READY);
 		if (channel->caller_profile && channel->caller_profile->times) {
@@ -2007,7 +2008,7 @@
 	const char *var = NULL;
 	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;
 		switch_core_session_t *other_session;