From: Joshua Colp <jcolp@digium.com>
Date: Mon, 29 Jan 2007 23:45:39 +0000 (+0000)
Subject: Merged revisions 52717 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~3335
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=095b911df146069afb9719c075a7b3585976a5e4;p=thirdparty%2Fasterisk.git

Merged revisions 52717 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r52717 | file | 2007-01-29 18:43:40 -0500 (Mon, 29 Jan 2007) | 10 lines

Merged revisions 52716 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r52716 | file | 2007-01-29 18:39:39 -0500 (Mon, 29 Jan 2007) | 2 lines

Now that filename is part of the structure and since it comes before postprocess... we have to add it to our postprocess line. (reported on asterisk-dev by Boris Bakchiev)

........

................


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

diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c
index 8023091a12..40faee2160 100644
--- a/apps/app_mixmonitor.c
+++ b/apps/app_mixmonitor.c
@@ -263,7 +263,7 @@ static void launch_monitor_thread(struct ast_channel *chan, const char *filename
 	mixmonitor->name = (char *) mixmonitor + sizeof(*mixmonitor);
 	strcpy(mixmonitor->name, chan->name);
 	if (!ast_strlen_zero(postprocess2)) {
-		mixmonitor->post_process = mixmonitor->name + strlen(mixmonitor->name) + 1;
+		mixmonitor->post_process = mixmonitor->name + strlen(mixmonitor->name) + strlen(filename) + 2;
 		strcpy(mixmonitor->post_process, postprocess2);
 	}