mirror of
https://github.com/asterisk/asterisk.git
synced 2026-01-07 10:31:16 +00:00
Make parking resume properly when in macro
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1270 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -137,9 +137,18 @@ int ast_park_call(struct ast_channel *chan, struct ast_channel *peer, int timeou
|
||||
*extout = x;
|
||||
/* Remember what had been dialed, so that if the parking
|
||||
expires, we try to come back to the same place */
|
||||
strncpy(pu->context, chan->context, sizeof(pu->context)-1);
|
||||
strncpy(pu->exten, chan->exten, sizeof(pu->exten)-1);
|
||||
pu->priority = chan->priority;
|
||||
if (strlen(chan->macrocontext))
|
||||
strncpy(pu->context, chan->macrocontext, sizeof(pu->context)-1);
|
||||
else
|
||||
strncpy(pu->context, chan->context, sizeof(pu->context)-1);
|
||||
if (strlen(chan->macroexten))
|
||||
strncpy(pu->exten, chan->macroexten, sizeof(pu->exten)-1);
|
||||
else
|
||||
strncpy(pu->exten, chan->exten, sizeof(pu->exten)-1);
|
||||
if (chan->macropriority)
|
||||
pu->priority = chan->macropriority;
|
||||
else
|
||||
pu->priority = chan->priority;
|
||||
pu->next = parkinglot;
|
||||
parkinglot = pu;
|
||||
ast_pthread_mutex_unlock(&parking_lock);
|
||||
|
||||
Reference in New Issue
Block a user