sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Luigi Rizzo 2006-04-16 22:02:30 +00:00
parent 9d825a2126
commit 2c7b77814c
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
res/res_features.c
View File

@ -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;
}