Merged revisions 58512 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Thu, 8 Mar 2007 23:21:44 +0000 (23:21 +0000)
committerRussell Bryant <russell@russellbryant.com>
Thu, 8 Mar 2007 23:21:44 +0000 (23:21 +0000)
commitb1678e3b5080c8d7bf9b0aa382e47eb34827dd04
tree4aed74d4339e41457c62e6fc0720fb07b9293481
parentd04a9e0bc0e6fd5ac01d56d7ad1a4ddf83bb7aee
Merged revisions 58512 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r58512 | russell | 2007-03-08 16:15:15 -0600 (Thu, 08 Mar 2007) | 5 lines

Hang up the channel that put the call on hold in the event processing thread to
avoid a race condition.  Also, if the station originated the call that it is
putting on hold, don't hang up the trunk if it was the only station on the call
and it is hanging up due to hold and not a normal hangup.

........

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