[asterisk-commits] file: trunk r41693 - in /trunk: ./ main/channel.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Fri Sep  1 11:34:57 2006
New Revision: 41693

URL: http://svn.digium.com/view/asterisk?rev=41693&view=rev
Log:
Merged revisions 41690 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r41690 | file | 2006-09-01 12:28:08 -0400 (Fri, 01 Sep 2006) | 2 lines

Don't treat an unexpected control subclass as voice (issue #7858 reported by PCadach)

........

Modified:
    trunk/   (props changed)
    trunk/main/channel.c

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

Modified: trunk/main/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/main/channel.c?rev=41693&r1=41692&r2=41693&view=diff
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Fri Sep  1 11:34:57 2006
@@ -1862,7 +1862,9 @@
 					break;
 				default:
 					ast_log(LOG_WARNING, "Unexpected control subclass '%d'\n", f->subclass);
+					break;
 				}
+				break;
 			case AST_FRAME_VOICE:
 				/* Write audio if appropriate */
 				if (audiofd > -1)