[asterisk-commits] file: branch 1.4 r69895 - in /branches/1.4: ./ apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: file
Date: Tue Jun 19 08:55:25 2007
New Revision: 69895

URL: http://svn.digium.com/view/asterisk?view=rev&rev=69895
Log:
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:
    branches/1.4/   (props changed)
    branches/1.4/apps/app_meetme.c

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

Modified: branches/1.4/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/apps/app_meetme.c?view=diff&rev=69895&r1=69894&r2=69895
==============================================================================
--- branches/1.4/apps/app_meetme.c (original)
+++ branches/1.4/apps/app_meetme.c Tue Jun 19 08:55:25 2007
@@ -1878,6 +1878,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) {
@@ -2137,8 +2141,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) {