]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-6477 --resolve
authorAnthony Minessale <anthm@freeswitch.org>
Tue, 22 Apr 2014 18:51:44 +0000 (23:51 +0500)
committerAnthony Minessale <anthm@freeswitch.org>
Tue, 22 Apr 2014 18:53:44 +0000 (23:53 +0500)
Conflicts:
src/mod/applications/mod_conference/mod_conference.c

src/mod/applications/mod_conference/mod_conference.c

index 7b7f7bbadae658499c4a78a3960629edb9f8105e..600f1374938c6fd300341adf09e633cb39217029 100644 (file)
@@ -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;