[asterisk-commits] coreyfarrell: trunk r427182 - in /trunk: ./ main/app.c

[SVN commits to the Asterisk project]

Author: coreyfarrell
Date: Tue Nov  4 08:11:54 2014
New Revision: 427182

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

Modified:
    trunk/   (props changed)
    trunk/main/app.c

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

Modified: trunk/main/app.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/app.c?view=diff&rev=427182&r1=427181&r2=427182
==============================================================================
--- trunk/main/app.c (original)
+++ trunk/main/app.c Tue Nov  4 08:11:54 2014
@@ -1793,7 +1793,7 @@
 				break;
 			}
 			if (!realfiles[x]) {
-				ast_closestream(others[0]);
+				ast_closestream(others[x]);
 				continue;
 			}
 			/*!\note Same logic as above. */