[svn-commits] qwell: trunk r940 - /trunk/menuselect.c

[SVN commits to the Digium repositories]

Author: qwell
Date: Wed Sep 28 16:59:21 2011
New Revision: 940

URL: http://svnview.digium.com/svn/menuselect?view=rev&rev=940
Log:
Don't enable modules that are explicitly disabled by default.

Modified:
    trunk/menuselect.c

Modified: trunk/menuselect.c
URL: http://svnview.digium.com/svn/menuselect/trunk/menuselect.c?view=diff&rev=940&r1=939&r2=940
==============================================================================
--- trunk/menuselect.c (original)
+++ trunk/menuselect.c Wed Sep 28 16:59:21 2011
@@ -287,14 +287,14 @@
 				mem->explicitly_enabled_only = !strcasecmp(tmp, "yes");
 			}
 
-			if (!cat->positive_output) {
-				mem->was_enabled = mem->enabled = 1;
-				print_debug("Enabling %s because the category does not have positive output\n", mem->name);
-			}
-
 			cur3 = mxmlFindElement(cur2, cur2, "defaultenabled", NULL, NULL, MXML_DESCEND);
 			if (cur3 && cur3->child) {
 				mem->defaultenabled = cur3->child->value.opaque;
+			}
+
+			if (!cat->positive_output && (!mem->defaultenabled || !strcasecmp(mem->defaultenabled, "yes"))) {
+				mem->was_enabled = mem->enabled = 1;
+				print_debug("Enabling %s because the category does not have positive output\n", mem->name);
 			}
 
 			cur3 = mxmlFindElement(cur2, cur2, "support_level", NULL, NULL, MXML_DESCEND);