mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-26 14:27:14 +00:00
Don't set the formats before we stop indications. (issue #6380)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@9759 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -985,6 +985,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) {
|
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);
|
ast_log(LOG_WARNING, "Unable to set '%s' to write linear mode\n", chan->name);
|
||||||
goto outrun;
|
goto outrun;
|
||||||
@@ -995,7 +997,6 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
|
|||||||
goto outrun;
|
goto outrun;
|
||||||
}
|
}
|
||||||
|
|
||||||
ast_indicate(chan, -1);
|
|
||||||
retryzap = strcasecmp(chan->tech->type, "Zap");
|
retryzap = strcasecmp(chan->tech->type, "Zap");
|
||||||
user->zapchannel = !retryzap;
|
user->zapchannel = !retryzap;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user