[asterisk-commits] file: trunk r52718 - in /trunk: ./ apps/app_mixmonitor.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Mon Jan 29 17:45:39 2007
New Revision: 52718

URL: http://svn.digium.com/view/asterisk?view=rev&rev=52718
Log:
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)

........

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

Modified:
    trunk/   (props changed)
    trunk/apps/app_mixmonitor.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_mixmonitor.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_mixmonitor.c?view=diff&rev=52718&r1=52717&r2=52718
==============================================================================
--- trunk/apps/app_mixmonitor.c (original)
+++ trunk/apps/app_mixmonitor.c Mon Jan 29 17:45:39 2007
@@ -263,7 +263,7 @@
 	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);
 	}