diff options
| author | Luigi Rizzo <rizzo@icir.org> | 2006-04-16 22:02:30 +0000 |
|---|---|---|
| committer | Luigi Rizzo <rizzo@icir.org> | 2006-04-16 22:02:30 +0000 |
| commit | 2c7b77814c9d6404ba2178352908284ffa157eeb (patch) | |
| tree | 1c084b9d3490dbdd03dc7f2eef4ca5772d94cae0 /res/res_features.c | |
| parent | 9d825a2126f6e894df74db2df9f2907e9b638964 (diff) | |
one more instance of stream_and_wait, and remove an extra
'error = 1' line put in by miustake
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20693 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_features.c')
| -rw-r--r-- | res/res_features.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/res/res_features.c b/res/res_features.c index ffecb5008..7c925f2e4 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -1622,7 +1622,6 @@ static int park_exec(struct ast_channel *chan, void *data) struct parkeduser *pu, *pl=NULL; struct ast_context *con; int park; - int dres; struct ast_bridge_config config; if (!data) { @@ -1682,7 +1681,6 @@ static int park_exec(struct ast_channel *chan, void *data) ast_indicate(peer, AST_CONTROL_UNHOLD); if (parkedplay == 0) { error = stream_and_wait(chan, courtesytone, chan->language, ""); - error = 1; } else if (parkedplay == 1) { error = stream_and_wait(peer, courtesytone, chan->language, ""); } else if (parkedplay == 2) { @@ -1729,13 +1727,8 @@ static int park_exec(struct ast_channel *chan, void *data) return res; } else { /* XXX Play a message XXX */ - dres = ast_streamfile(chan, "pbx-invalidpark", chan->language); - if (!dres) - dres = ast_waitstream(chan, ""); - else { + if (stream_and_wait(chan, "pbx-invalidpark", chan->language, "")) ast_log(LOG_WARNING, "ast_streamfile of %s failed on %s\n", "pbx-invalidpark", chan->name); - dres = 0; - } if (option_verbose > 2) ast_verbose(VERBOSE_PREFIX_3 "Channel %s tried to talk to nonexistent parked call %d\n", chan->name, park); res = -1; @@ -1809,9 +1802,9 @@ static int handle_parkedcalls(int fd, int argc, char *argv[]) numparked++; } + ast_mutex_unlock(&parking_lock); ast_cli(fd, "%d parked call%s.\n", numparked, (numparked != 1) ? "s" : ""); - ast_mutex_unlock(&parking_lock); return RESULT_SUCCESS; } |