kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1258 in FS/freeswitch from ~THEHUNMONKGROUP/freeswitch:FS-10261-fire-conference-destroy-event-later to master 

* commit 'cf1a0a5a51fcfa76d7c6f0f9867a5534a7ccb0ef':
  FS-10261: Fire conference-destroy event later
This commit is contained in:
Mike Jerris 2017-04-24 20:59:19 +00:00
parent fde6afda4c cf1a0a5a51
commit 67f60ad206
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mod/applications/mod_conference/mod_conference.c
View File

@ -789,11 +789,6 @@ void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, void *ob
switch_cond_next();
}
switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT);
conference_event_add_data(conference, event);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "conference-destroy");
switch_event_fire(&event);
switch_core_timer_destroy(&timer);
switch_mutex_lock(conference_globals.hash_mutex);
if (conference_utils_test_flag(conference, CFLAG_INHASH)) {
@ -831,6 +826,12 @@ void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, void *ob
}
conference->end_time = switch_epoch_time_now(NULL);
switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT);
conference_event_add_data(conference, event);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "conference-destroy");
switch_event_fire(&event);
conference_cdr_render(conference);
switch_mutex_lock(conference_globals.setup_mutex);