diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-25 18:14:18 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-25 18:14:18 +0000 |
| commit | ba8d72667b5879ba62fb799e1d949b31c7d31ccb (patch) | |
| tree | 7aab6ff5afb730050403c53edde1edfc0211c747 /res | |
| parent | a455d6aa86a8b5577b6509e5c00278e211a6ac5b (diff) | |
Merged revisions 258776 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r258776 | tilghman | 2010-04-25 13:12:14 -0500 (Sun, 25 Apr 2010) | 13 lines
Merged revisions 258775 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r258775 | tilghman | 2010-04-25 13:09:05 -0500 (Sun, 25 Apr 2010) | 6 lines
When StopMonitor is called, ensure that it will not be restarted by a channel event.
(closes issue #16590)
Reported by: kkm
Patches:
resmonitor-16590-trunk.239289.diff uploaded by kkm (license 888)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@258779 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_monitor.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/res/res_monitor.c b/res/res_monitor.c index 1b537868d..a0f2ff512 100644 --- a/res/res_monitor.c +++ b/res/res_monitor.c @@ -372,7 +372,9 @@ int ast_monitor_stop(struct ast_channel *chan, int need_lock) chan->name, chan->uniqueid ); + pbx_builtin_setvar_helper(chan, "MONITORED", NULL); } + pbx_builtin_setvar_helper(chan, "AUTO_MONITOR", NULL); UNLOCK_IF_NEEDED(chan, need_lock); |