aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-04-25 18:09:05 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-04-25 18:09:05 +0000
commiteedee5e779d466c9a13cbb104db2eeac383050fb (patch)
tree769114a40b5f545cdc77fca6fb00495648359500 /res
parent6d9bb360afac9ad013e2ff1297215b25463fb40e (diff)
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.4@258775 f38db490-d61c-443f-a65b-d21fe96a405b
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 d18a8ce25..dc24d4a72 100644
--- a/res/res_monitor.c
+++ b/res/res_monitor.c
@@ -335,7 +335,9 @@ int ast_monitor_stop(struct ast_channel *chan, int need_lock)
free(chan->monitor->format);
free(chan->monitor);
chan->monitor = NULL;
+ pbx_builtin_setvar_helper(chan, "MONITORED", NULL);
}
+ pbx_builtin_setvar_helper(chan, "AUTO_MONITOR", NULL);
UNLOCK_IF_NEEDED(chan, need_lock);