Skip to content

Commit dfc38b0

Browse files
committed
Fix user overrides caching for multi-profile
1 parent c1569eb commit dfc38b0

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

resources/lib/skinshorcuts/datafunctions.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -563,21 +563,22 @@ def get_overrides_skin(self):
563563

564564
def _get_overrides_user(self, profile_dir="special://profile"):
565565
# Get overrides.xml provided by user
566-
if "user" in self.overrides:
567-
return self.overrides["user"]
566+
cache_key = "user-%s" % profile_dir
567+
if cache_key in self.overrides:
568+
return self.overrides[cache_key]
568569

569570
override_path = os.path.join(profile_dir, "overrides.xml")
570571
self.hashable.add(override_path)
571572
try:
572573
tree = ETree.parse(xbmcvfs.translatePath(override_path))
573-
self.overrides["user"] = tree
574+
self.overrides[cache_key] = tree
574575
return tree
575576
except:
576577
if xbmcvfs.exists(override_path):
577578
log("Unable to parse user overrides.xml. Invalid xml?")
578579

579580
tree = ETree.ElementTree(ETree.Element("overrides"))
580-
self.overrides["user"] = tree
581+
self.overrides[cache_key] = tree
581582
return tree
582583

583584
def get_additionalproperties(self):

0 commit comments

Comments
 (0)