Skip to content
Snippets Groups Projects
Commit 4b4be549 authored by Automerge script's avatar Automerge script
Browse files

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
parent 748b374a
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment