]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-3095 regression from 547d53932c4849dff81001b0d6b2a787f7fdb8da
authorAnthony Minessale <anthm@freeswitch.org>
Wed, 9 Mar 2011 21:16:15 +0000 (15:16 -0600)
committerAnthony Minessale <anthm@freeswitch.org>
Wed, 9 Mar 2011 21:17:25 +0000 (15:17 -0600)
src/mod/applications/mod_conference/mod_conference.c

index d0f5fac081961baed95d2958be26fce3bad40950..762bc1aa40e5dc47e015d3b57ee549aa5528d789 100644 (file)
@@ -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) {