diff options
| author | Automerge script <automerge@asterisk.org> | 2013-01-15 23:20:18 +0000 |
|---|---|---|
| committer | Automerge script <automerge@asterisk.org> | 2013-01-15 23:20:18 +0000 |
| commit | 0dc9cc48a0b80e041ca03bc957cb4e11567b205a (patch) | |
| tree | fb197a5a0db526f4c19817d818f6fbaec8617d11 /main | |
| parent | a73d6e5b86cfeac94791874295743ae61504ccec (diff) | |
Merged revisions 379128 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk
........
r379128 | rmudgett | 2013-01-15 16:23:49 -0600 (Tue, 15 Jan 2013) | 1 line
Fix ast_bridge_features_register() not registering builtin features. I broke. Ooops.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@379138 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/bridging.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/bridging.c b/main/bridging.c index c331ee174..057a44223 100644 --- a/main/bridging.c +++ b/main/bridging.c @@ -1341,7 +1341,7 @@ void ast_bridge_technology_unsuspend(struct ast_bridge_technology *technology) int ast_bridge_features_register(enum ast_bridge_builtin_feature feature, ast_bridge_features_hook_callback callback, const char *dtmf) { if (ARRAY_LEN(builtin_features_handlers) <= feature - || !builtin_features_handlers[feature]) { + || builtin_features_handlers[feature]) { return -1; } |