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 /main | |
| 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 'main')
| -rw-r--r-- | main/pbx.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/main/pbx.c b/main/pbx.c index 538b5fb9c..a800ae873 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -5292,8 +5292,10 @@ static int pbx_builtin_background(struct ast_channel *chan, void *data) AST_APP_ARG(context); ); - if (ast_strlen_zero(data)) + if (ast_strlen_zero(data)) { ast_log(LOG_WARNING, "Background requires an argument (filename)\n"); + return -1; + } parse = ast_strdupa(data); |