Fix mismerge from revision 176708 pointed out by Kaloyan Kovachev on the
authorJeff Peeler <jpeeler@digium.com>
Thu, 19 Feb 2009 15:56:31 +0000 (15:56 +0000)
committerJeff Peeler <jpeeler@digium.com>
Thu, 19 Feb 2009 15:56:31 +0000 (15:56 +0000)
asterisk-dev mailing list. Thanks!

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@177356 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/features.c

index 076988d..4058101 100644 (file)
@@ -2542,7 +2542,6 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
                                config->feature_timer -= diff;
                        }
 
-                       config->feature_timer -= diff;
                        if (hasfeatures) {
                                /* Running on backup config, meaning a feature might be being
                                   activated, but that's no excuse to keep things going