kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-20 16:50:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "app: Queue hangup if channel is hung up during sub or macro execution." into 13

Browse Source
This commit is contained in:
Mark Michelson
2016-01-13 15:10:42 -06:00
committed by Gerrit Code Review
parent f18ad96b77 32b29d7b02
commit caba57631d
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main/app.c
View File

@@ -357,6 +357,11 @@ int ast_app_exec_macro(struct ast_channel *autoservice_chan, struct ast_channel
if (autoservice_chan) {
ast_autoservice_stop(autoservice_chan);
}
if (ast_check_hangup_locked(macro_chan)) {
ast_queue_hangup(macro_chan);
}
return res;
}
@@ -433,6 +438,11 @@ int ast_app_exec_sub(struct ast_channel *autoservice_chan, struct ast_channel *s
if (autoservice_chan) {
ast_autoservice_stop(autoservice_chan);
}
if (!ignore_hangup && ast_check_hangup_locked(sub_chan)) {
ast_queue_hangup(sub_chan);
}
return res;
}