From: Anthony Minessale <anthm@freeswitch.org>
Date: Fri, 6 Feb 2015 18:39:30 +0000 (-0600)
Subject: FS-7513: clear group when switching to standard layout
X-Git-Tag: v1.6.2~614^2~431
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8ce20e6bfb5a149eab1b2c4f0490e24262e8ec8;p=thirdparty%2Ffreeswitch.git

FS-7513: clear group when switching to standard layout
---

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index c9633fdbc5..1875ac9cd4 100644
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -7633,11 +7633,15 @@ static switch_status_t conf_api_sub_vid_layout(conference_obj_t *conference, swi
 		}
 	}
 
-	if (!vlayout && !(vlayout = switch_core_hash_find(conference->layout_hash, argv[2]))) {
+	if (!vlayout && (vlayout = switch_core_hash_find(conference->layout_hash, argv[2]))) {
+		conference->video_layout_group = NULL;
+	}
+
+	if (!vlayout) {
 		stream->write_function(stream, "Invalid layout [%s]\n", argv[2]);
 		return SWITCH_STATUS_SUCCESS;
 	}
-
+	
 	stream->write_function(stream, "Change to layout [%s]\n", vlayout->name);
 
 	switch_mutex_lock(conference->member_mutex);