diff --git a/packages/mediacenter/kodi/config/appliance.xml b/packages/mediacenter/kodi/config/appliance.xml
index 6459825bb1..830fab65f2 100644
--- a/packages/mediacenter/kodi/config/appliance.xml
+++ b/packages/mediacenter/kodi/config/appliance.xml
@@ -24,6 +24,13 @@
+
+
+
+ /storage/screenshots/
+
+
+
diff --git a/packages/mediacenter/kodi/config/guisettings.xml b/packages/mediacenter/kodi/config/guisettings.xml
index 8599258e30..39d322489e 100755
--- a/packages/mediacenter/kodi/config/guisettings.xml
+++ b/packages/mediacenter/kodi/config/guisettings.xml
@@ -1,7 +1,4 @@
-
- /storage/screenshots/
-
2
diff --git a/packages/mediacenter/kodi/scripts/xml_merge.py b/packages/mediacenter/kodi/scripts/xml_merge.py
index a64c35c5a8..f7fd547f36 100755
--- a/packages/mediacenter/kodi/scripts/xml_merge.py
+++ b/packages/mediacenter/kodi/scripts/xml_merge.py
@@ -11,6 +11,10 @@ from xml.etree import ElementTree as et
def printerr(*args, **kwargs):
print(*args, file=sys.stderr, **kwargs)
+class hashabledict(dict):
+ def __hash__(self):
+ return hash(tuple(sorted(self.items())))
+
class XMLCombiner(object):
def __init__(self, filenames):
if len(filenames) == 0:
@@ -32,19 +36,19 @@ class XMLCombiner(object):
return self.prettyPrint(self.roots[0])
def combine_element(self, one, other):
- mapping = {el.tag: el for el in one}
+ mapping = {(el.tag, hashabledict(el.attrib)): el for el in one}
for el in other:
if len(el) == 0:
try:
- mapping[el.tag].text = el.text
+ mapping[(el.tag, hashabledict(el.attrib))].text = el.text
except KeyError:
- mapping[el.tag] = el
+ mapping[(el.tag, hashabledict(el.attrib))] = el
one.append(el)
else:
try:
- self.combine_element(mapping[el.tag], el)
+ self.combine_element(mapping[(el.tag, hashabledict(el.attrib))], el)
except KeyError:
- mapping[el.tag] = el
+ mapping[(el.tag, hashabledict(el.attrib))] = el
one.append(el)
if __name__ == '__main__':
diff --git a/projects/imx6/kodi/guisettings.xml b/projects/imx6/kodi/guisettings.xml
index 7a123f8f11..68634f252d 100644
--- a/projects/imx6/kodi/guisettings.xml
+++ b/projects/imx6/kodi/guisettings.xml
@@ -1,10 +1,4 @@
-
- /storage/screenshots/
-
-
- 3
-
ALSA:hdmi:CARD=imxhdmisoc,DEV=0