From: Automerge script <automerge@asterisk.org>
Date: Tue, 15 Jan 2013 23:20:18 +0000 (+0000)
Subject: Merged revisions 379128 via svnmerge from
X-Git-Tag: 13.0.0-beta1~2194^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0dc9cc48a0b80e041ca03bc957cb4e11567b205a;p=thirdparty%2Fasterisk.git

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
---

diff --git a/main/bridging.c b/main/bridging.c
index c331ee174d..057a442236 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;
 	}