[svn-commits] qwell: tag autotag_for_asterisk r971 - /tags/autotag_for_asterisk/1.8.8.0-rc3/

[SVN commits to the Digium repositories]

Author: qwell
Date: Wed Nov  9 16:56:57 2011
New Revision: 971

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

(closes issue ASTERISK-18738)

Modified:
    tags/autotag_for_asterisk/1.8.8.0-rc3/menuselect.c

Modified: tags/autotag_for_asterisk/1.8.8.0-rc3/menuselect.c
URL: http://svnview.digium.com/svn/menuselect/tags/autotag_for_asterisk/1.8.8.0-rc3/menuselect.c?view=diff&rev=971&r1=970&r2=971
==============================================================================
--- tags/autotag_for_asterisk/1.8.8.0-rc3/menuselect.c (original)
+++ tags/autotag_for_asterisk/1.8.8.0-rc3/menuselect.c Wed Nov  9 16:56:57 2011
@@ -292,9 +292,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("Enabling %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("Enabling %s because the category does not have positive output\n", mem->name);
+				}
 			}
 
 			cur3 = mxmlFindElement(cur2, cur2, "support_level", NULL, NULL, MXML_DESCEND);