From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Sun, 25 Apr 2010 18:12:14 +0000 (+0000)
Subject: Merged revisions 258775 via svnmerge from
X-Git-Tag: 11.0.0-beta1~3127
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56a6994310cf9e7e472ea0d0f493b8e33d009176;p=thirdparty%2Fasterisk.git

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
---

diff --git a/res/res_monitor.c b/res/res_monitor.c
index 959a80c3ff..febdab4a61 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);