]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-7513: clear group when switching to standard layout
authorAnthony Minessale <anthm@freeswitch.org>
Fri, 6 Feb 2015 18:39:30 +0000 (12:39 -0600)
committerMichael Jerris <mike@jerris.com>
Thu, 28 May 2015 17:46:58 +0000 (12:46 -0500)
src/mod/applications/mod_conference/mod_conference.c

index c9633fdbc561120c1e8bdaf85a75b46f152648e7..1875ac9cd45b9e3de06916928d51ff9f8afa8b1e 100644 (file)
@@ -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);