[svn-commits] file: trunk r61962 - in /trunk: ./ res/res_monitor.c

[svn-commits at lists.digium.com]

Author: file
Date: Wed Apr 25 20:50:02 2007
New Revision: 61962

URL: http://svn.digium.com/view/asterisk?view=rev&rev=61962
Log:
Merged revisions 61961 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r61961 | file | 2007-04-25 21:48:55 -0400 (Wed, 25 Apr 2007) | 2 lines

Don't always say that the channel is being paused if it is actually being unpaused in the Manager ack message. (reported by jsmith in #asterisk-bugs)

........

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://svn.digium.com/view/asterisk/trunk/res/res_monitor.c?view=diff&rev=61962&r1=61961&r2=61962
==============================================================================
--- trunk/res/res_monitor.c (original)
+++ trunk/res/res_monitor.c Wed Apr 25 20:50:02 2007
@@ -625,7 +625,7 @@
 		ast_monitor_unpause(c);
 	
 	ast_channel_unlock(c);
-	astman_send_ack(s, m, "Paused monitoring of the channel");
+	astman_send_ack(s, m, (action == MONITOR_ACTION_PAUSE ? "Paused monitoring of the channel" : "Unpaused monitoring of the channel"));
 	return 0;	
 }