[svn-commits] phsultan: branch phsultan/jingle-support r229901 - in /team/phsultan/jingle-s...

[SVN commits to the Digium repositories]

Author: phsultan
Date: Fri Nov 13 05:28:13 2009
New Revision: 229901

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

........
r229871 | oej | 2009-11-13 11:53:14 +0100 (Fri, 13 Nov 2009) | 4 lines

Fixing trunk in a way so that it compiles again.

Thanks, Philippe :-)

........

Modified:
    team/phsultan/jingle-support/   (props changed)
    team/phsultan/jingle-support/main/loader.c

Propchange: team/phsultan/jingle-support/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Nov 13 05:28:13 2009
@@ -1,1 +1,1 @@
-/trunk:1-229849
+/trunk:1-229899

Modified: team/phsultan/jingle-support/main/loader.c
URL: http://svnview.digium.com/svn/asterisk/team/phsultan/jingle-support/main/loader.c?view=diff&rev=229901&r1=229900&r2=229901
==============================================================================
--- team/phsultan/jingle-support/main/loader.c (original)
+++ team/phsultan/jingle-support/main/loader.c Fri Nov 13 05:28:13 2009
@@ -853,7 +853,8 @@
 		if (!resource_name_match(order->resource, resource)) {
 			/* Make sure we have the proper setting for the required field 
 			   (we might have both load= and required= lines in modules.conf) */
-				order->required |= required;
+			order->required |= required;
+			return NULL;
 		}
 		return NULL;
 	}