From 28ae331c938e4a461c6adafe2f0e38d9557e38fd Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Mon, 10 Aug 2015 18:48:01 -0400 Subject: [PATCH] FS-7930: [mod_conference] Correct termination of conference when the last member with endconf left. Caused by typo in migration to conference_utils_set_flag function when we switched to array based flags --- src/mod/applications/mod_conference/mod_conference.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index 7b513826d1..1dd7e4d9a1 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -664,7 +664,8 @@ void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, void *ob switch_epoch_time_now(NULL) - conference->endconference_time > conference->endconference_grace_time) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Conference %s: endconf grace time exceeded (%u)\n", conference->name, conference->endconference_grace_time); - conference_utils_set_flag(conference, CFLAG_DESTRUCT | CFLAG_ENDCONF_FORCED); + conference_utils_set_flag(conference, CFLAG_DESTRUCT); + conference_utils_set_flag(conference, CFLAG_ENDCONF_FORCED); } switch_mutex_unlock(conference->mutex);