[asterisk-commits] tilghman: branch 1.6.0 r258777 - in /branches/1.6.0: ./ res/res_monitor.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Sun Apr 25 13:14:01 2010
New Revision: 258777

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=258777
Log:
Merged revisions 258776 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r258776 | tilghman | 2010-04-25 13:12:14 -0500 (Sun, 25 Apr 2010) | 13 lines
  
  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:
    branches/1.6.0/   (props changed)
    branches/1.6.0/res/res_monitor.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

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