From 577c24306fe630b8b4ec7b3cefed86511c550cdd Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Tue, 7 Jan 2025 22:23:14 +0200 Subject: [PATCH] theme: don't try to load "themerc"s if theme_name is NULL theme_name is NULL when ... is in rc.xml --- src/theme.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/theme.c b/src/theme.c index e087b662..b0ebdf5f 100644 --- a/src/theme.c +++ b/src/theme.c @@ -1496,15 +1496,18 @@ theme_init(struct theme *theme, struct server *server, const char *theme_name) */ theme_builtin(theme, server); - /* - * Read - * - /share/themes/$theme_name/labwc/themerc - * - /share/themes/$theme_name/openbox-3/themerc - */ struct wl_list paths; - paths_theme_create(&paths, theme_name, "themerc"); - theme_read(theme, &paths); - paths_destroy(&paths); + + if (theme_name) { + /* + * Read + * - /share/themes/$theme_name/labwc/themerc + * - /share/themes/$theme_name/openbox-3/themerc + */ + paths_theme_create(&paths, theme_name, "themerc"); + theme_read(theme, &paths); + paths_destroy(&paths); + } /* Read /labwc/themerc-override */ paths_config_create(&paths, "themerc-override");