Merge pull request #36 from Ignoble61/build-rewrite

Fix bugs introduced in speed-improvement changes
BigNoid · Aug 8, 2015 · 1f1179e · 1f1179e
2 parents 1b4ffef + 309aae1
commit 1f1179e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/resources/lib/xmlfunctions.py b/resources/lib/xmlfunctions.py
@@ -476,15 +476,15 @@ def writexml( self, profilelist, mainmenuID, groups, numLevels, buildMode, progr
 
                         menuitemCopy = copy.deepcopy( menuitem )
                         visibilityElement = menuitemCopy.find( "visible" )
-                        visibilityElement.text += " + [%s]" %( "StringCompare(Window(10000).Property(submenuVisibility)," + DATA.slugify( submenuVisibilityName, convertInteger=True ) + ")" )
+                        visibilityElement.text = "[%s] + %s" %( visibilityElement.text, "StringCompare(Window(10000).Property(submenuVisibility)," + DATA.slugify( submenuVisibilityName, convertInteger=True ) + ")" )
                         justmenuTreeB.append( menuitemCopy )
 
                         if buildMode == "single":
-                            submenu.append( copy.deepcopy( menuitemCopy ) )
+                            allmenuTree.append( copy.deepcopy( menuitemCopy ) )
 
                         menuitemCopy = copy.deepcopy( menuitem )
                         visibilityElement = menuitemCopy.find( "visible" )
-                        visibilityElement.text += " + [%s]" %( "StringCompare(Container(" + mainmenuID + ").ListItem.Property(submenuVisibility)," + DATA.slugify( submenuVisibilityName, convertInteger=True ) + ")" )
+                        visibilityElement.text = "[%s] + %s" %( visibilityElement.text, "StringCompare(Container(" + mainmenuID + ").ListItem.Property(submenuVisibility)," + DATA.slugify( submenuVisibilityName, convertInteger=True ) + ")" )
                         submenuTree.append( menuitemCopy )
 
                     # Build the template for the submenu