From 227a23fdb539ff4170e747add2d594e860c0c801 Mon Sep 17 00:00:00 2001 From: tobi-wan-kenobi Date: Mon, 29 Jun 2020 20:07:24 +0200 Subject: [PATCH] [core/theme] fix mergeing of iconsets iconsets should only overwrite parameters that are *not* set in the main theme file. 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..b52c465 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) + self.__data = util.algorithm.merge(self.__data, self.load(icons, "icons")) if iconset != "auto": self.__data = util.algorithm.merge(self.load(iconset, "icons"), self.__data) for colors in self.__data.get("colors", []):