diff options
author | Mark Spencer <markster@digium.com> | 2004-06-02 23:27:50 +0000 |
---|---|---|
committer | Mark Spencer <markster@digium.com> | 2004-06-02 23:27:50 +0000 |
commit | 8f5498177efb982ffefe07cfd5434b648727e127 (patch) | |
tree | d4e5693dd4a650bc98b000535c8a6879e120fc25 /apps | |
parent | 8f9ace922806a411b825badcb3a57f82fd32a412 (diff) |
WOrk on the proper pointer (bug #1773)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3136 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
-rwxr-xr-x | apps/app_meetme.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index c068ad57a..98b423734 100755 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -918,7 +918,7 @@ zapretry: outrun: if (user->user_no) { /* Only cleanup users who really joined! */ - manager_event(EVENT_FLAG_CALL, "MeetmeLeave", + manager_event(EVENT_FLAG_CALL, "MeetmeLeave", "Channel: %s\r\n" "Uniqueid: %s\r\n" "Meetme: %s\r\n", @@ -926,34 +926,34 @@ outrun: ast_mutex_lock(&conflock); conf->users--; cur = confs; - if (!conf->users) { - /* No more users -- close this one out */ - while(cur) { - if (cur == conf) { - if (prev) - prev->next = conf->next; - else - confs = conf->next; - break; + if (!conf->users) { + /* No more users -- close this one out */ + while(cur) { + if (cur == conf) { + if (prev) + prev->next = conf->next; + else + confs = conf->next; + break; + } + prev = cur; + cur = cur->next; } - prev = cur; - cur = cur->next; - } - if (!cur) - ast_log(LOG_WARNING, "Conference not found\n"); - if (conf->chan) - ast_hangup(conf->chan); - else - close(conf->fd); - free(conf); + if (!cur) + ast_log(LOG_WARNING, "Conference not found\n"); + if (conf->chan) + ast_hangup(conf->chan); + else + close(conf->fd); + free(conf); } else { /* Remove the user struct */ - if (user == cur->firstuser) { - cur->firstuser->nextuser->prevuser = NULL; - cur->firstuser = cur->firstuser->nextuser; - } else if (user == cur->lastuser){ - cur->lastuser->prevuser->nextuser = NULL; - cur->lastuser = cur->lastuser->prevuser; + if (user == conf->firstuser) { + user->nextuser->prevuser = NULL; + conf->firstuser = user->nextuser; + } else if (user == conf->lastuser){ + user->prevuser->nextuser = NULL; + conf->lastuser = user->prevuser; } else { user->nextuser->prevuser = user->prevuser; user->prevuser->nextuser = user->nextuser; |