Merged revisions 376312 via svnmerge from
authorAutomerge script <automerge@asterisk.org>
Thu, 15 Nov 2012 23:20:11 +0000 (23:20 +0000)
committerAutomerge script <automerge@asterisk.org>
Thu, 15 Nov 2012 23:20:11 +0000 (23:20 +0000)
commit4b4be549cb5ac9e43e0f19cfe5cddb726bec5896
treea0b809b3e273c74a9b405ac469b7f81da9319268
parent748b374ac8a76b8c9ba2fe8adc518865e5ff5071
Merged revisions 376312 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk

................
  r376312 | jrose | 2012-11-15 17:10:13 -0600 (Thu, 15 Nov 2012) | 23 lines

  app_meetme: Fix channels lingering when hung up under certain conditions

  Channels would get stuck and MeetMe would repeatedly display an Unable
  to write frame to channel error in the conf_run function if hung up
  during certain sound prompts such as during user count announcements.
  This patch fixes that by reintroducing a hangup check in the meetme's
  main loop (also in conf_run).

  (closes issue ASTERISK-20486)
  Reported by: Michael Cargile
  Review: https://reviewboard.asterisk.org/r/2187/
  Patches:
      meetme_hangup_patch_ASTERISK-20486_v3.diff uploaded by Jonathan Rose (license 6182)
  ........

  Merged revisions 376307 from http://svn.asterisk.org/svn/asterisk/branches/1.8
  ........

  Merged revisions 376308 from http://svn.asterisk.org/svn/asterisk/branches/10
  ........

  Merged revisions 376310 from http://svn.asterisk.org/svn/asterisk/branches/11
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@376320 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/app_meetme.c