Fix proper cleanup (bug #3481)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4945 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2-netsec
Mark Spencer 21 years ago
parent e89fb66d79
commit d93cfc416c

@ -1108,14 +1108,15 @@ zapretry:
if (!(confflags & CONFFLAG_QUIET) && !(confflags & CONFFLAG_MONITOR) && !(confflags & CONFFLAG_ADMIN)) if (!(confflags & CONFFLAG_QUIET) && !(confflags & CONFFLAG_MONITOR) && !(confflags & CONFFLAG_ADMIN))
conf_play(conf, LEAVE); conf_play(conf, LEAVE);
if (!(confflags & CONFFLAG_QUIET) && (confflags & CONFFLAG_INTROUSER) && conf->users > 1) { if (!(confflags & CONFFLAG_QUIET) && (confflags & CONFFLAG_INTROUSER)) {
if (conf->chan && ast_fileexists(user->namerecloc, NULL, NULL)) { if (ast_fileexists(user->namerecloc, NULL, NULL)) {
if (!ast_streamfile(conf->chan, user->namerecloc, chan->language)) if ((conf->chan) && (conf->users > 1)) {
ast_waitstream(conf->chan, ""); if (!ast_streamfile(conf->chan, user->namerecloc, chan->language))
if (!ast_streamfile(conf->chan, "conf-hasleft", chan->language)) ast_waitstream(conf->chan, "");
ast_waitstream(conf->chan, ""); if (!ast_streamfile(conf->chan, "conf-hasleft", chan->language))
ast_waitstream(conf->chan, "");
}
ast_filedelete(user->namerecloc, NULL); ast_filedelete(user->namerecloc, NULL);
} }
} }
ast_mutex_unlock(&conflock); ast_mutex_unlock(&conflock);

Loading…
Cancel
Save