[svn-commits] tilghman: trunk r258776 - in /trunk: ./ res/res_monitor.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Sun Apr 25 13:12:14 2010
New Revision: 258776

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=258776
Log:
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)
........

Modified:
    trunk/   (props changed)
    trunk/res/res_monitor.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/res/res_monitor.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_monitor.c?view=diff&rev=258776&r1=258775&r2=258776
==============================================================================
--- trunk/res/res_monitor.c (original)
+++ trunk/res/res_monitor.c Sun Apr 25 13:12:14 2010
@@ -509,7 +509,9 @@
 	                        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);