summaryrefslogtreecommitdiff
path: root/main/json.c
diff options
context:
space:
mode:
authorMichael L. Young <elgueromexicano@gmail.com>2013-03-22 20:43:24 +0000
committerMichael L. Young <elgueromexicano@gmail.com>2013-03-22 20:43:24 +0000
commit2a65c9408c6e590d10d974b758a7c42ee824b923 (patch)
tree151d39905fe6e64de38991c03a80c8f90918340e /main/json.c
parentcfd2b244f7afbe828a2d6b80d680009d7cfbd05c (diff)
Fix StopMixMonitor Hanging Up When Unable To Stop MixMonitor On A Channel
A regression was accidentally introduced when allowing an optional ID to be used when calling StopMixMonitor. When we are unable to stop MixMonitor on a channel, -1 is being returned which triggers the hangup of the channel. This patch restores the prior behavior by returning 0 whether we were successful or not. It also allows the call from the manager to use the return code when the action fails. (closes issue ASTERISK-21294) Reported by: daroz Tested by: daroz Patches: asterisk-21294-stop_mixmonitor_hangingup.diff Michael L. Young (license 5026) Review: https://reviewboard.asterisk.org/r/2404/ ........ Merged revisions 383631 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@383632 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/json.c')
0 files changed, 0 insertions, 0 deletions