automerge commit

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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 45a738fa28ee25080522a483dbfd2257427a51f8..f541758d81eaeef5b9abaf25eb0ef8213ce5de38 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -949,6 +949,8 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
                }
        }
 
+       ast_indicate(chan, -1);
+
        if (ast_set_write_format(chan, AST_FORMAT_SLINEAR) < 0) {
                ast_log(LOG_WARNING, "Unable to set '%s' to write linear mode\n", chan->name);
                goto outrun;
@@ -959,7 +961,6 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
                goto outrun;
        }
 
-       ast_indicate(chan, -1);
        retryzap = strcasecmp(chan->type, "Zap");
        user->zapchannel = !retryzap;