[svn-commits] tilghman: branch 1.4 r258775 - /branches/1.4/res/res_monitor.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Sun Apr 25 13:09:05 2010
New Revision: 258775

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=258775
Log:
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.4/res/res_monitor.c

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