[asterisk-commits] mnicholson: branch 1.6.2 r275145 - in /branches/1.6.2: ./ main/loader.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Fri Jul  9 12:51:16 2010
New Revision: 275145

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

................
  r275144 | mnicholson | 2010-07-09 12:50:45 -0500 (Fri, 09 Jul 2010) | 9 lines
  
  Merged revisions 275143 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r275143 | mnicholson | 2010-07-09 12:50:05 -0500 (Fri, 09 Jul 2010) | 2 lines
    
    don't unload modules that returned AST_MODULE_LOAD_DECLINE when they were loaded
  ........
................

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://svnview.digium.com/svn/asterisk/branches/1.6.2/main/loader.c?view=diff&rev=275145&r1=275144&r2=275145
==============================================================================
--- branches/1.6.2/main/loader.c (original)
+++ branches/1.6.2/main/loader.c Fri Jul  9 12:51:16 2010
@@ -467,7 +467,7 @@
 				continue;
 			}
 			AST_LIST_REMOVE_CURRENT(entry);
-			if (mod->info->unload) {
+			if (mod->flags.running && !mod->flags.declined && mod->info->unload) {
 				mod->info->unload();
 			}
 			AST_LIST_HEAD_DESTROY(&mod->users);
@@ -494,7 +494,7 @@
 		return -1;
 	}
 
-	if (!(mod->flags.running || mod->flags.declined))
+	if (!mod->flags.running || mod->flags.declined)
 		error = 1;
 
 	if (!error && (mod->usecount > 0)) {