[asterisk-commits] file: trunk r69896 - in /trunk: ./ apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: file
Date: Tue Jun 19 08:56:37 2007
New Revision: 69896

URL: http://svn.digium.com/view/asterisk?view=rev&rev=69896
Log:
Merged revisions 69895 via svnmerge from 
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)

........

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

Modified:
    trunk/   (props changed)
    trunk/apps/app_meetme.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_meetme.c?view=diff&rev=69896&r1=69895&r2=69896
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Tue Jun 19 08:56:37 2007
@@ -1897,6 +1897,10 @@
 				ret = 0;
 				break;
 			}
+
+			/* Perform an extra hangup check just in case */
+			if (ast_check_hangup(chan))
+				break;
 
 			if (c) {
 				if (c->fds[0] != origfd) {
@@ -2157,8 +2161,6 @@
 						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) {