From 320bba97d059a59e253ca40aff92378492896027 Mon Sep 17 00:00:00 2001 From: tobi-wan-kenobi Date: Sun, 28 Jun 2020 20:01:08 +0200 Subject: [PATCH] [core/theme] Make theme iconsets *not* override settings Make sure that iconsets used as part of a theme do *not* override anything already existing inside the theme. Only iconsets that are manually specified can override settings in the theme now (because those, you typically specify on the CLI). TODO: Write unit test for this fixes #666 --- bumblebee_status/core/theme.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bumblebee_status/core/theme.py b/bumblebee_status/core/theme.py index f50286a..8ed689d 100644 --- a/bumblebee_status/core/theme.py +++ b/bumblebee_status/core/theme.py @@ -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", []): - self.__data = util.algorithm.merge(self.load(icons, "icons"), 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", []):