kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 11:32:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 173067 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r173067 | twilson | 2009-02-02 17:57:25 -0600 (Mon, 02 Feb 2009) | 9 lines
  
  Merged revisions 173066 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r173066 | twilson | 2009-02-02 17:48:06 -0600 (Mon, 02 Feb 2009) | 2 lines
    
    Fix a feature inheritance bug I added after code review
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173069 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Terry Wilson
2009-02-03 00:01:13 +00:00
parent b87793e0f1
commit 8024a0df33
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/features.c
View File

@@ -2257,6 +2257,10 @@ static void add_features_datastores(struct ast_channel *caller, struct ast_chann
ast_channel_lock(caller);
ast_channel_datastore_add(caller, ds_caller_features);
ast_channel_unlock(caller);
} else {
/* If we don't return here, then when we do a builtin_atxfer we will copy the disconnect
* flags over from the atxfer to the caller */
return;
}
ast_channel_lock(callee);