[asterisk-commits] file: branch 1.6.0 r119356 - in /branches/1.6.0: ./ main/autoservice.c

[SVN commits to the Asterisk project]

Author: file
Date: Fri May 30 14:48:25 2008
New Revision: 119356

URL: http://svn.digium.com/view/asterisk?view=rev&rev=119356
Log:
Merged revisions 119355 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r119355 | file | 2008-05-30 16:47:30 -0300 (Fri, 30 May 2008) | 10 lines

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

........
r119354 | file | 2008-05-30 16:46:37 -0300 (Fri, 30 May 2008) | 2 lines

Fix a bug I found while testing for another issue.

........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/autoservice.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/autoservice.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/autoservice.c?view=diff&rev=119356&r1=119355&r2=119356
==============================================================================
--- branches/1.6.0/main/autoservice.c (original)
+++ branches/1.6.0/main/autoservice.c Fri May 30 14:48:25 2008
@@ -155,21 +155,20 @@
 			continue;
 		}
 
-		for (i = 0; i < x; i++) {
-			struct ast_frame *dup_f;
-
-			if (mons[i] != chan) {
-				continue;
-			}
-
-			if ((dup_f = ast_frdup(f))) {
-				AST_LIST_INSERT_TAIL(&ents[i]->deferred_frames, dup_f, frame_list);
-			}
-			
-			break;
-		}
-
 		if (f) {
+			for (i = 0; i < x; i++) {
+				struct ast_frame *dup_f;
+				
+				if (mons[i] != chan) {
+					continue;
+				}
+				
+				if ((dup_f = ast_frdup(f))) {
+					AST_LIST_INSERT_TAIL(&ents[i]->deferred_frames, dup_f, frame_list);
+				}
+				
+				break;
+			}
 			ast_frfree(f);
 		}
 	}