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

[asterisk-commits at lists.digium.com]

Author: file
Date: Wed Jun 13 14:10:16 2007
New Revision: 69147

URL: http://svn.digium.com/view/asterisk?view=rev&rev=69147
Log:
Merged revisions 69144 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r69144 | file | 2007-06-13 15:08:24 -0400 (Wed, 13 Jun 2007) | 2 lines

Really ignore NULL frames and check whether the channel hungup or not. (issue #9912 reported by junky)

........

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=69147&r1=69146&r2=69147
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Wed Jun 13 14:10:16 2007
@@ -2136,12 +2136,16 @@
 					default:
 						break;
 					}
+				} else if (f->frametype == AST_FRAME_NULL) {
+					/* Ignore NULL frames. It is perfectly normal to get these if the person is muted. */
 				} else if (option_debug) {
 					ast_log(LOG_DEBUG,
 						"Got unrecognized frame on channel %s, f->frametype=%d,f->subclass=%d\n",
 						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) {