[svn-commits] file: trunk r81404 - in /trunk: ./ res/res_features.c

[SVN commits to the Digium repositories]

Author: file
Date: Fri Aug 31 09:40:21 2007
New Revision: 81404

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

........
r81403 | file | 2007-08-31 11:38:59 -0300 (Fri, 31 Aug 2007) | 4 lines

(closes issue #10618)
Reported by: dimas
Don't pass through the stopped sounds frame.... just drop it.

........

Modified:
    trunk/   (props changed)
    trunk/res/res_features.c

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

Modified: trunk/res/res_features.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_features.c?view=diff&rev=81404&r1=81403&r2=81404
==============================================================================
--- trunk/res/res_features.c (original)
+++ trunk/res/res_features.c Fri Aug 31 09:40:21 2007
@@ -1625,14 +1625,7 @@
 							f = NULL;
 							ready=1;
 							break;
-						} else if (f->subclass == -1) {
-							if (option_verbose > 2)
-								ast_verbose( VERBOSE_PREFIX_3 "%s stopped sounds\n", chan->name);
-							ast_indicate(caller, -1);
-							ast_frfree(f);
-							f = NULL;
-							break;
-						} else {
+						} else if (f->subclass != -1) {
 							ast_log(LOG_NOTICE, "Don't know what to do about control frame: %d\n", f->subclass);
 						}
 						/* else who cares */