[svn-commits] trunk r25323 - in /trunk: ./ apps/app_meetme.c

[svn-commits at lists.digium.com]

Author: bweschke
Date: Sun May  7 08:39:32 2006
New Revision: 25323

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

........
r25322 | bweschke | 2006-05-07 09:38:11 -0400 (Sun, 07 May 2006) | 3 lines

 Fix playback behavior to exit correctly when we receive a hangup during playback of the invalid pin message. #7091 (AntD reporting)


........

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

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

Modified: trunk/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_meetme.c?rev=25323&r1=25322&r2=25323&view=diff
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Sun May  7 08:39:32 2006
@@ -2150,9 +2150,12 @@
 								break;
 							} else {
 								/* Pin invalid */
-								res = ast_streamfile(chan, "conf-invalidpin", chan->language);
-								if (!res)
-									ast_waitstream(chan, AST_DIGIT_ANY);
+								if (!ast_streamfile(chan, "conf-invalidpin", chan->language))
+									res = ast_waitstream(chan, AST_DIGIT_ANY);
+								else {
+									ast_log(LOG_WARNING, "Couldn't play invalid pin msg!\n");
+									break;
+								}
 								if (res < 0) {
 									AST_LIST_LOCK(&confs);
 									cnf->refcount--;