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

Merge pull request #916 in FS/freeswitch from ~PROWLAH/freeswitch:Improvement/FS-9385-check-ghosts-before-conf-destroy to master 

* commit '3227b02194842c92db4b3219ce8604e68c4bea41':
  do not destroy conference if ghost(s) are present, add ghost count check before setting flag
This commit is contained in:
Anthony Minessale II 2016-07-26 15:57:10 -05:00
parent 2c86910092 3227b02194
commit e89b8a481b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2250,7 +2250,7 @@ SWITCH_STANDARD_APP(conference_function)
if (conference) {
switch_mutex_lock(conference->mutex);
if (conference_utils_test_flag(conference, CFLAG_DYNAMIC) && conference->count == 0) {
if (conference_utils_test_flag(conference, CFLAG_DYNAMIC) && conference->count == 0 && conference->count_ghosts == 0) {
conference_utils_set_flag_locked(conference, CFLAG_DESTRUCT);
}
switch_mutex_unlock(conference->mutex);