[asterisk-commits] twilson: branch 1.6.2 r213453 - in /branches/1.6.2: ./ main/loader.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Thu Aug 20 22:53:19 2009
New Revision: 213453

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=213453
Log:
Merged revisions 213450 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r213450 | twilson | 2009-08-20 22:48:54 -0500 (Thu, 20 Aug 2009) | 2 lines
  
  Make LOAD_ORDER actually work
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/loader.c

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

Modified: branches/1.6.2/main/loader.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/main/loader.c?view=diff&rev=213453&r1=213452&r2=213453
==============================================================================
--- branches/1.6.2/main/loader.c (original)
+++ branches/1.6.2/main/loader.c Thu Aug 20 22:53:19 2009
@@ -857,7 +857,7 @@
 	int res = -1;
 	/* if load_pri is not set, default is 255.  Lower is better*/
 	unsigned char a_pri = ast_test_flag(a_mod->info, AST_MODFLAG_LOAD_ORDER) ? a_mod->info->load_pri : 255;
-	unsigned char b_pri = ast_test_flag(a_mod->info, AST_MODFLAG_LOAD_ORDER) ? b_mod->info->load_pri : 255;
+	unsigned char b_pri = ast_test_flag(b_mod->info, AST_MODFLAG_LOAD_ORDER) ? b_mod->info->load_pri : 255;
 	if (a_pri == b_pri) {
 		res = 0;
 	} else if (a_pri < b_pri) {