summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2007-04-26 01:50:02 +0000
committerJoshua Colp <jcolp@digium.com>2007-04-26 01:50:02 +0000
commita212ff5a7872f0aca5ecd079975b01109375c060 (patch)
tree1df138c663b0d84342cda292e065b4a92dd82033 /res
parent489f9c68c31f36ebf1e9119920237a1580def1b0 (diff)
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
Diffstat (limited to 'res')
-rw-r--r--res/res_monitor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_monitor.c b/res/res_monitor.c
index 094cc3a72..7b69b6043 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;
}