From: Joshua Colp <jcolp@digium.com>
Date: Thu, 26 Apr 2007 01:50:02 +0000 (+0000)
Subject: Merged revisions 61961 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2805
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a212ff5a7872f0aca5ecd079975b01109375c060;p=thirdparty%2Fasterisk.git

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)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61962 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_monitor.c b/res/res_monitor.c
index 094cc3a72f..7b69b60434 100644
--- a/res/res_monitor.c
+++ b/res/res_monitor.c
@@ -625,7 +625,7 @@ static int do_pause_or_unpause(struct mansession *s, const struct message *m, in
 		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;	
 }