Merged revisions 376208 via svnmerge from

Merged revisions 376208 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

................
  r376208 | beagles | 2012-11-13 12:20:13 -0600 (Tue, 13 Nov 2012) | 14 lines

  Patch to prevent stopping the active generator when it is not the silence
  generator.

  This patch introduces an internal helper function to safely check whether the
  current generator is the one that is expected before deactivating it. The
  current externally accessible ast_channel_stop_generator() function has been
  modified to be implemented in terms of the new function.

  (closes issue ASTERISK-19918)
  Reported by: Eduardo Abad
  ........

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@376216 65c4cc65-6c06-0410-ace0-fbb531ad65f3