Revert "[core/theme] Make theme iconsets *not* override settings"

This reverts commit 320bba97d0.
This commit is contained in:
tobi-wan-kenobi 2020-06-28 20:09:55 +02:00
parent 320bba97d0
commit 6b09be1993

View file

@ -53,7 +53,7 @@ class Theme(object):
self.__data = raw_data if raw_data else self.load(name)
for icons in self.__data.get("icons", []):
util.algorithm.merge(self.load(icons, "icons"), self.__data)
self.__data = util.algorithm.merge(self.load(icons, "icons"), self.__data)
if iconset != "auto":
self.__data = util.algorithm.merge(self.load(iconset, "icons"), self.__data)
for colors in self.__data.get("colors", []):