diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-25 18:14:01 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-25 18:14:01 +0000 |
| commit | 0a4d6384055d6753317a94495c0d0efcd3acc053 (patch) | |
| tree | e5d92e1b16575633dccf8e9bbc45e2235d99ea32 | |
| parent | 329d45482e75abe7a22d45c366796d2dbc981bd7 (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.0@258777 f38db490-d61c-443f-a65b-d21fe96a405b
| -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 56f7d8f3f..207c05e72 100644 --- a/res/res_monitor.c +++ b/res/res_monitor.c @@ -371,7 +371,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); |