diff options
| author | Jason Parker <jparker@digium.com> | 2006-09-27 19:45:24 +0000 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2006-09-27 19:45:24 +0000 |
| commit | 5a45352f3abc6036d3433ba42e94d08308ae523a (patch) | |
| tree | 18abea3a6950769876f23f45cb56663c3d039dd6 /apps | |
| parent | dad32d9d71ba73a4a8dee9eecad49cb20442eb9d (diff) | |
Merged revisions 43803 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r43803 | qwell | 2006-09-27 12:44:02 -0700 (Wed, 27 Sep 2006) | 4 lines
Fix an issue with PLAYBACKSTATUS not being set under certain circumstances.
Fix a minor issue, to make it use the filenames that were parsed, instead of the entire argument string.
Fix Background() to return -1 like Playback(), if no args are specified.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43804 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_playback.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/app_playback.c b/apps/app_playback.c index 87b06b02e..396ed71e6 100644 --- a/apps/app_playback.c +++ b/apps/app_playback.c @@ -380,6 +380,7 @@ static struct ast_cli_entry cli_playback[] = { static int playback_exec(struct ast_channel *chan, void *data) { int res = 0; + int mres = 0; struct ast_module_user *u; char *tmp; int option_skip=0; @@ -422,11 +423,11 @@ static int playback_exec(struct ast_channel *chan, void *data) res = ast_answer(chan); } if (!res) { - int mres = 0; + char *back = args.filenames; char *front; ast_stopstream(chan); - while (!res && (front = strsep(&tmp, "&"))) { + while (!res && (front = strsep(&back, "&"))) { if (option_say) res = say_full(chan, front, "", chan->language, NULL, -1, -1); else @@ -442,9 +443,9 @@ static int playback_exec(struct ast_channel *chan, void *data) mres = 1; } } - pbx_builtin_setvar_helper(chan, "PLAYBACKSTATUS", mres ? "FAILED" : "SUCCESS"); } done: + pbx_builtin_setvar_helper(chan, "PLAYBACKSTATUS", mres ? "FAILED" : "SUCCESS"); ast_module_user_remove(u); return res; } |