From d8ce20e6bfb5a149eab1b2c4f0490e24262e8ec8 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Fri, 6 Feb 2015 12:39:30 -0600 Subject: [PATCH] FS-7513: clear group when switching to standard layout --- src/mod/applications/mod_conference/mod_conference.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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);