automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43813 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-09-27 20:01:41 +00:00
parent 97834bbed9
commit 854e0369df
2 changed files with 6 additions and 5 deletions

View File

@@ -110,6 +110,7 @@ static int playback_exec(struct ast_channel *chan, void *data)
if (chan->_state != AST_STATE_UP) {
if (option_skip) {
/* At the user's option, skip if the line is not up */
pbx_builtin_setvar_helper(chan, "PLAYBACKSTATUS", "SUCCESS");
LOCAL_USER_REMOVE(u);
return 0;
} else if (!option_noanswer)
@@ -137,11 +138,11 @@ static int playback_exec(struct ast_channel *chan, void *data)
}
front = back;
}
if (mres)
pbx_builtin_setvar_helper(chan, "PLAYBACKSTATUS", "FAILED");
else
pbx_builtin_setvar_helper(chan, "PLAYBACKSTATUS", "SUCCESS");
}
if (mres)
pbx_builtin_setvar_helper(chan, "PLAYBACKSTATUS", "FAILED");
else
pbx_builtin_setvar_helper(chan, "PLAYBACKSTATUS", "SUCCESS");
LOCAL_USER_REMOVE(u);
return res;
}