automerge commit

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

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 (!ast_streamfile(chan, "conf-invalidpin", chan->language))
-								if (!res)
+									res = ast_waitstream(chan, AST_DIGIT_ANY);
-									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;