From f1ce5e162a5bb0fb1041b5d3f217865cdb444e01 Mon Sep 17 00:00:00 2001 From: Tobias Witek Date: Tue, 26 May 2020 07:56:04 +0200 Subject: [PATCH] [theme] load custom iconset first the "merge" algorithm only fills in missing elements - i.e. the most important pieces of a data structure must be filled in first. since the iconset specified on the CLI takes precedence over anything present in the config, load the CLI-provided iconset *first*. hopefully fixes #634 --- bumblebee_status/core/theme.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bumblebee_status/core/theme.py b/bumblebee_status/core/theme.py index 82eded2..f02498b 100644 --- a/bumblebee_status/core/theme.py +++ b/bumblebee_status/core/theme.py @@ -52,10 +52,10 @@ class Theme(object): self.__keywords = {} self.__value_idx = {} self.__data = raw_data if raw_data else self.load(name) - for icons in self.__data.get("icons", []): - util.algorithm.merge(self.__data, self.load(icons, "icons")) if iconset != "auto": util.algorithm.merge(self.__data, self.load(iconset, "icons")) + for icons in self.__data.get("icons", []): + util.algorithm.merge(self.__data, self.load(icons, "icons")) for colors in self.__data.get("colors", []): util.algorithm.merge(self.__keywords, self.load_keywords(colors))