From: Anthony Minessale Date: Wed, 25 Jan 2012 15:38:42 +0000 (-0600) Subject: send event when removing floor flag X-Git-Tag: v1.2-rc1~19^2~1^2~32^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ec4935ca745b3b619f7c1499e7ff7b02717aee3;p=thirdparty%2Ffreeswitch.git send event when removing floor flag --- diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index 448784d642..6671168915 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -1101,6 +1101,14 @@ static switch_status_t conference_del_member(conference_obj_t *conference, confe if (member == member->conference->floor_holder) { member->conference->floor_holder = NULL; + + if (test_eflag(conference, EFLAG_FLOOR_CHANGE)) { + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "floor-change"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Old-ID", "%d", member->id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-ID", "none"); + switch_event_fire(&event); + } } member->conference = NULL; @@ -1257,7 +1265,6 @@ static void *SWITCH_THREAD_FUNC conference_video_thread_run(switch_thread_t *thr switch_core_session_rwunlock(session); if (!SWITCH_READ_ACCEPTABLE(status)) { - conference->floor_holder = NULL; goto do_continue; }