Merged revisions 379128 via svnmerge from
authorAutomerge script <automerge@asterisk.org>
Tue, 15 Jan 2013 23:20:18 +0000 (23:20 +0000)
committerAutomerge script <automerge@asterisk.org>
Tue, 15 Jan 2013 23:20:18 +0000 (23:20 +0000)
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

main/bridging.c

index c331ee1..057a442 100644 (file)
@@ -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;
        }