From 51dd2eb93ba73c4e31b53420e114cdd14c85d2ef Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 22 Apr 2014 23:51:44 +0500 Subject: [PATCH] FS-6477 --resolve Conflicts: src/mod/applications/mod_conference/mod_conference.c --- src/mod/applications/mod_conference/mod_conference.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index 7b7f7bbada..600f137493 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -615,7 +615,7 @@ static const char *audio_flow(conference_member_t *member) } if (member->session && switch_channel_test_flag(switch_core_session_get_channel(member->session), CF_HOLD)) { - flow = "sendonly"; + flow = switch_test_flag(member, MFLAG_CAN_SPEAK) ? "sendonly" : "inactive"; } return flow;