automerge commit

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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index f541758d81eaeef5b9abaf25eb0ef8213ce5de38..63b6691fa259909da36ee04e9143a32a2c5cef7e 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -1351,9 +1351,10 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
                                                if (!menu_active) {
                                                        menu_active = 1;
                                                        /* Record this sound! */
-                                                       if (!ast_streamfile(chan, "conf-adminmenu", chan->language))
+                                                       if (!ast_streamfile(chan, "conf-adminmenu", chan->language)) {
                                                                dtmf = ast_waitstream(chan, AST_DIGIT_ANY);
-                                                       else 
+                                                               ast_stopstream(chan);
+                                                       } else 
                                                                dtmf = 0;
                                                } else 
                                                        dtmf = f->subclass;
@@ -1430,9 +1431,10 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
                                                /* User menu */
                                                if (!menu_active) {
                                                        menu_active = 1;
-                                                       if (!ast_streamfile(chan, "conf-usermenu", chan->language))
+                                                       if (!ast_streamfile(chan, "conf-usermenu", chan->language)) {
                                                                dtmf = ast_waitstream(chan, AST_DIGIT_ANY);
-                                                       else
+                                                               ast_stopstream(chan);
+                                                       } else
                                                                dtmf = 0;
                                                } else 
                                                        dtmf = f->subclass;