Attended transfer (*2) call from Queue results in wrong CNAM if qwait is enabled

When doing an Attended transfer of a call from the Queue the resulting CallerID Name displays the original callers Name prefixed with the wait time instead of the Transferer Name.

Call flow :

{noformat}
Caller A(Calls) -> Queue(Dials B) -> Caller B(Att. Transfer to C) -> Caller C(Sees CallerID Caller A With Queue Waittime Prefixed){noformat}

This only happens when using the 'Wait time Prefix' of the queue application.

To test just create a Queue with that option enabled, dial the queue than after answering the call on a queuemember phone, transfer it using the feature-code *2

I have it fixed bij using the same solution as the fix used in : http://www.freepbx.org/trac/ticket/5374

The relevant diaplan code is :

{noformat}
[macro-dial-one]
exten => qwait,1,ExecIf($["${CUT(CHANNEL,@,2):5:5}"!="queue"]?Return())
exten => qwait,n,ExecIf($["${SAVEDCIDNAME}" = ""]?Set(__SAVEDCIDNAME=${CALLERID(name)}))
exten => qwait,n,Set(ELAPSED=${MATH($[${EPOCH}+30-${QUEUEWAIT}]/60,int)})
exten => qwait,n,Set(CALLERID(name)=M${ELAPSED}:${SAVEDCIDNAME})
exten => qwait,n,Return(){noformat}

this will only prefix the CallerID Name when the call originated from a queue context.

Richard