kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-3627 --resolve

This commit is contained in:
Anthony Minessale 2011-10-21 09:49:44 -05:00
parent 2faaee0e6e
commit 24b09ca158
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mod/applications/mod_conference/mod_conference.c
View File

@ -759,12 +759,21 @@ static conference_member_t *conference_member_get(conference_obj_t *conference,
} }
} }
if (member && !switch_test_flag(member, MFLAG_INTREE)) { if (member) {
if (!switch_test_flag(member, MFLAG_INTREE) ||
switch_test_flag(member, MFLAG_KICKED) ||
(member->session && !switch_channel_up(switch_core_session_get_channel(member->session)))) {
/* member is kicked or hanging up so forget it */
member = NULL; member = NULL;
} }
}
if (member) { if (member) {
switch_thread_rwlock_rdlock(member->rwlock); if (switch_thread_rwlock_tryrdlock(member->rwlock) != SWITCH_STATUS_SUCCESS) {
/* if you cant readlock it's way to late to do anything */
member = NULL;
}
} }
switch_mutex_unlock(conference->member_mutex); switch_mutex_unlock(conference->member_mutex);
@ -3554,7 +3563,7 @@ static switch_status_t conference_member_play_file(conference_member_t *member,
conference_file_node_t *fnode, *nptr = NULL; conference_file_node_t *fnode, *nptr = NULL;
switch_memory_pool_t *pool; switch_memory_pool_t *pool;
if (member == NULL || file == NULL) if (member == NULL || file == NULL || switch_test_flag(member, MFLAG_KICKED))
return status; return status;
if ((expanded = switch_channel_expand_variables(switch_core_session_get_channel(member->session), file)) != file) { if ((expanded = switch_channel_expand_variables(switch_core_session_get_channel(member->session), file)) != file) {