Merged revisions 258775 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Sun, 25 Apr 2010 18:12:14 +0000 (18:12 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Sun, 25 Apr 2010 18:12:14 +0000 (18:12 +0000)
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

res/res_monitor.c

index 959a80c..febdab4 100644 (file)
@@ -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);