Merged revisions 107637 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Tue, 11 Mar 2008 18:48:59 +0000 (18:48 +0000)
committerJoshua Colp <jcolp@digium.com>
Tue, 11 Mar 2008 18:48:59 +0000 (18:48 +0000)
commitb5003a194308b7b38f4af3ded7786211c20f5b86
tree63af7bedcd1e48445b7d48cd3cb4526ef8ee15d5
parent7683956e91ad7213577768fcad033b7d2d0830c9
Merged revisions 107637 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r107637 | file | 2008-03-11 15:47:33 -0300 (Tue, 11 Mar 2008) | 4 lines

Add an additional check for setting conference parameter when using the marked user options. It was possible for it to return to a no listen/no talk state if a masquerade happened.
(closes issue #12136)
Reported by: aragon

........

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