summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorTilghman Lesher <tilghman@meg.abyt.es>2010-04-25 18:12:14 +0000
committerTilghman Lesher <tilghman@meg.abyt.es>2010-04-25 18:12:14 +0000
commit56a6994310cf9e7e472ea0d0f493b8e33d009176 (patch)
tree6fa5dc24655255382541a30caa0a4368b6326804 /res
parentb65e2b6f98369c940e7b6a3726c06d99e81bb499 (diff)
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: https://origsvn.digium.com/svn/asterisk/trunk@258776 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
-rw-r--r--res/res_monitor.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/res/res_monitor.c b/res/res_monitor.c
index 959a80c3f..febdab4a6 100644
--- a/res/res_monitor.c
+++ b/res/res_monitor.c
@@ -509,7 +509,9 @@ int AST_OPTIONAL_API_NAME(ast_monitor_stop)(struct ast_channel *chan, int need_l
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);