From: Anthony Minessale <anthm@freeswitch.org>
Date: Fri, 21 Oct 2011 14:49:44 +0000 (-0500)
Subject: FS-3627 --resolve
X-Git-Tag: v1.2-rc1~27^2~315
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24b09ca15870fbd3b2a15124edd50d141652059f;p=thirdparty%2Ffreeswitch.git

FS-3627 --resolve
---

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index a64d719f7a..e0a29e1e4b 100644
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -759,12 +759,21 @@ static conference_member_t *conference_member_get(conference_obj_t *conference,
 		}
 	}
 
-	if (member && !switch_test_flag(member, MFLAG_INTREE)) {
-		member = NULL;
+	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;
+		}
 	}
 
 	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);
@@ -3554,7 +3563,7 @@ static switch_status_t conference_member_play_file(conference_member_t *member,
 	conference_file_node_t *fnode, *nptr = NULL;
 	switch_memory_pool_t *pool;
 
-	if (member == NULL || file == NULL)
+	if (member == NULL || file == NULL || switch_test_flag(member, MFLAG_KICKED))
 		return status;
 
 	if ((expanded = switch_channel_expand_variables(switch_core_session_get_channel(member->session), file)) != file) {