From: Corey Farrell Date: Tue, 4 Nov 2014 14:11:54 +0000 (+0000) Subject: Fix crash caused by merge error on review 4138 X-Git-Tag: 14.0.0-beta1~1495 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdc35c77b95af9ef8239b401f6f4a7fbaa824af4;p=thirdparty%2Fasterisk.git Fix crash caused by merge error on review 4138 When merging from 12 to 13 there were conflicts, I mistakenly had the loop run ast_closestream(others[0]) when it should be ast_closestream(others[x]). ........ Merged revisions 427181 from http://svn.asterisk.org/svn/asterisk/branches/13 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@427182 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/app.c b/main/app.c index dea5ee6ed7..53987d8cd6 100644 --- a/main/app.c +++ b/main/app.c @@ -1793,7 +1793,7 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile, break; } if (!realfiles[x]) { - ast_closestream(others[0]); + ast_closestream(others[x]); continue; } /*!\note Same logic as above. */