[Freeswitch-trunk] [commit] r13638 - freeswitch/trunk/src/mod/applications/mod_conference

[FreeSWITCH SVN]

Author: mikej
Date: Fri Jun  5 11:16:56 2009
New Revision: 13638

Log:
mod_conference: don't transfer back to the same conference

Modified:
   freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c

Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c	Fri Jun  5 11:16:56 2009
@@ -3933,15 +3933,17 @@
 
 			/* move the member from the old conference to the new one */
 			switch_mutex_lock(member->control_mutex);
-			conference_del_member(conference, member);
-			conference_add_member(new_conference, member);
-
-			if (conference->rate != new_conference->rate) {
-				if (setup_media(member, new_conference)) {
-					switch_clear_flag_locked(member, MFLAG_RUNNING);
-				} else {
-					switch_channel_set_app_flag(channel, CF_APP_TAGGED);
-					switch_set_flag_locked(member, MFLAG_RESTART);
+			if (conference != new_conference) {
+				conference_del_member(conference, member);
+				conference_add_member(new_conference, member);
+
+				if (conference->rate != new_conference->rate) {
+					if (setup_media(member, new_conference)) {
+						switch_clear_flag_locked(member, MFLAG_RUNNING);
+					} else {
+						switch_channel_set_app_flag(channel, CF_APP_TAGGED);
+						switch_set_flag_locked(member, MFLAG_RESTART);
+					}
 				}
 			}