automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@25355 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 4b90e91d4a4798be140b2c4471a3594017f386a4..891b51554ca2f64e4678fed66efa2c5e7578b794 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -1965,9 +1965,12 @@ static int conf_exec(struct ast_channel *chan, void *data)
                                                                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)
                                                                        break;
                                                                pin[0] = res;