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

[SVN commits to the Digium repositories]

Author: qwell
Date: Wed Nov  9 16:22:13 2011
New Revision: 965

URL: http://svnview.digium.com/svn/menuselect?view=rev&rev=965
Log:
Fix issue with setting defaultenabled on categories that are already enabled by default.

(closes issue ASTERISK-18738)

Modified:
    trunk/menuselect.c

Modified: trunk/menuselect.c
URL: http://svnview.digium.com/svn/menuselect/trunk/menuselect.c?view=diff&rev=965&r1=964&r2=965
==============================================================================
--- trunk/menuselect.c (original)
+++ trunk/menuselect.c Wed Nov  9 16:22:13 2011
@@ -455,9 +455,12 @@
 				mem->defaultenabled = cur3->child->value.opaque;
 			}
 
-			if (!cat->positive_output && !(mem->defaultenabled && strcasecmp(mem->defaultenabled, "no"))) {
-				mem->was_enabled = mem->enabled = 1;
-				print_debug("Enabled %s because the category does not have positive output\n", mem->name);
+			if (!cat->positive_output) {
+				mem->enabled = 1;
+				if (!(mem->defaultenabled && strcasecmp(mem->defaultenabled, "no"))) {
+					mem->was_enabled = 1;
+					print_debug("Enabled %s because the category does not have positive output\n", mem->name);
+				}
 			}
 
 			cur3 = mxmlFindElement(cur2, cur2, "support_level", NULL, NULL, MXML_DESCEND);