From 8a842f8f7cf1020ca24f7aa9c114efc9e7fc3407 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Wed, 16 Aug 2017 14:16:45 -0500 Subject: [PATCH] FS-10561: [freeswitch-core,mod_conference] Video concurrency improvements for 1.8 -- fix locking regression #resolve --- src/mod/applications/mod_conference/conference_event.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/mod/applications/mod_conference/conference_event.c b/src/mod/applications/mod_conference/conference_event.c index 56343155c4..cd9b5c2b81 100644 --- a/src/mod/applications/mod_conference/conference_event.c +++ b/src/mod/applications/mod_conference/conference_event.c @@ -586,7 +586,6 @@ void conference_event_adv_layout(conference_obj_t *conference, mcu_canvas_t *can cJSON_AddItemToObject(msg, "eventChannel", cJSON_CreateString(conference->info_event_channel)); cJSON_AddItemToObject(data, "contentType", cJSON_CreateString("layout-info")); - switch_mutex_lock(canvas->write_mutex); switch_mutex_lock(canvas->mutex); if ((obj = get_canvas_info(canvas))) { @@ -622,7 +621,6 @@ void conference_event_adv_layout(conference_obj_t *conference, mcu_canvas_t *can cJSON_AddItemToObject(data, "canvasInfo", obj); } - switch_mutex_unlock(canvas->write_mutex); switch_mutex_unlock(canvas->mutex); switch_event_channel_broadcast(conference->info_event_channel, &msg, "mod_conference", conference_globals.event_channel_id);