kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_parking: Misc fixes."

Browse Source
This commit is contained in:
Joshua Colp
2016-03-29 09:03:55 -05:00
committed by Gerrit Code Review
parent 77a9272431 13e75ee04f
commit 6ce25bd62a
5 changed files with 38 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/parking/parking_bridge_features.c
View File

@@ -239,6 +239,7 @@ static struct ast_channel *park_local_transfer(struct ast_channel *parker, const
ast_channel_parkinglot_set(parkee, ast_channel_parkinglot(parker));
ast_connected_line_copy_from_caller(ast_channel_connected(parkee), ast_channel_caller(parker));
ast_channel_inherit_variables(parker, parkee);
ast_bridge_set_transfer_variables(parkee, ast_channel_name(parker), 0);
ast_channel_datastore_inherit(parker, parkee);
ast_channel_unlock(parker);
@@ -253,8 +254,6 @@ static struct ast_channel *park_local_transfer(struct ast_channel *parker, const
return NULL;
}
ast_bridge_set_transfer_variables(parkee_side_2, ast_channel_name(parker), 0);
ast_channel_unref(parkee_side_2);
/* Since the above worked fine now we actually call it and return the channel */