Merged revisions 69895 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Tue, 19 Jun 2007 13:56:37 +0000 (13:56 +0000)
committerJoshua Colp <jcolp@digium.com>
Tue, 19 Jun 2007 13:56:37 +0000 (13:56 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r69895 | file | 2007-06-19 09:55:25 -0400 (Tue, 19 Jun 2007) | 10 lines

Merged revisions 69894 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r69894 | file | 2007-06-19 09:54:03 -0400 (Tue, 19 Jun 2007) | 2 lines

Perform an extra hangup check just in case. (issue #9589 reported by bcnit)

........

................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@69896 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_meetme.c

index 7f38c08..ebb1403 100644 (file)
@@ -1898,6 +1898,10 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
                                break;
                        }
 
                                break;
                        }
 
+                       /* Perform an extra hangup check just in case */
+                       if (ast_check_hangup(chan))
+                               break;
+
                        if (c) {
                                if (c->fds[0] != origfd) {
                                        if (using_pseudo) {
                        if (c) {
                                if (c->fds[0] != origfd) {
                                        if (using_pseudo) {
@@ -2157,8 +2161,6 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
                                                chan->name, f->frametype, f->subclass);
                                }
                                ast_frfree(f);
                                                chan->name, f->frametype, f->subclass);
                                }
                                ast_frfree(f);
-                               if (ast_check_hangup(chan))
-                                       break;
                        } else if (outfd > -1) {
                                res = read(outfd, buf, CONF_SIZE);
                                if (res > 0) {
                        } else if (outfd > -1) {
                                res = read(outfd, buf, CONF_SIZE);
                                if (res > 0) {