From 8533c32fe1d5abe5267eb52148d1b0385fb685bf Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Wed, 9 Mar 2011 15:16:15 -0600 Subject: [PATCH] FS-3095 regression from 547d53932c4849dff81001b0d6b2a787f7fdb8da --- src/mod/applications/mod_conference/mod_conference.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index d0f5fac081..762bc1aa40 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -4625,6 +4625,7 @@ static switch_status_t conf_api_sub_transfer(conference_obj_t *conference, switc /* move the member from the old conference to the new one */ lock_member(member); + switch_thread_rwlock_unlock(member->rwlock); if (conference != new_conference) { conference_del_member(conference, member); @@ -4660,10 +4661,6 @@ static switch_status_t conf_api_sub_transfer(conference_obj_t *conference, switc switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "transfer"); switch_event_fire(&event); } - - if (member) { - switch_thread_rwlock_unlock(member->rwlock); - } } if (new_conference) {