From 057f894d527c06e1b0ab521912f64b75f466a582 Mon Sep 17 00:00:00 2001 From: tobi-wan-kenobi Date: Thu, 9 Jul 2020 06:56:43 +0200 Subject: [PATCH] [core/config] change preferred theme source now, it works like this: - if present, use what's on the CLI - if not, use what's present in the config - fallback is "default" see #679 --- bumblebee_status/core/config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bumblebee_status/core/config.py b/bumblebee_status/core/config.py index bde212e..353d42d 100644 --- a/bumblebee_status/core/config.py +++ b/bumblebee_status/core/config.py @@ -153,7 +153,7 @@ class Config(util.store.Store): default=[], help=PARAMETER_HELP, ) - parser.add_argument("-t", "--theme", default="default", help=THEME_HELP) + parser.add_argument("-t", "--theme", default=None, help=THEME_HELP) parser.add_argument( "-i", "--iconset", @@ -281,7 +281,7 @@ class Config(util.store.Store): """ def theme(self): - return self.get('theme', self.__args.theme) + return self.__args.theme or self.get("theme") or "default" """Returns the configured iconset name