# This is a combination of 2 commits.

# The first commit's message is:

FS-7166 #resolve

# This is the 2nd commit message:

revert
This commit is contained in:
Anthony Minessale
2015-01-23 15:08:00 -06:00
committed by Michael Jerris
parent f110ce40e2
commit 6789f37b39
3 changed files with 5 additions and 22 deletions
-8
View File
@@ -808,10 +808,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_perform_receive_message(swit
switch_channel_clear_flag(session->channel, CF_EARLY_MEDIA);
}
if (message->message_id == SWITCH_MESSAGE_INDICATE_MEDIA) {
switch_channel_set_flag(session->channel, CF_PROXY_OFF);
}
if (message->message_id == SWITCH_MESSAGE_INDICATE_DISPLAY) {
char *arg = NULL;
@@ -918,10 +914,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_perform_receive_message(swit
end:
if (message->message_id == SWITCH_MESSAGE_INDICATE_MEDIA) {
switch_channel_clear_flag(session->channel, CF_PROXY_OFF);
}
switch_core_session_free_message(&message);
switch_core_session_rwunlock(session);