desktop-entry.c: on detecting a broken icon theme, fall back to hicolor

Fixes: #3126
Reported-By: Kreevoz

diff --git a/src/desktop-entry.c b/src/desktop-entry.c
index 7aefa77e6567811fce973d2766d5429e3b33d6cf..4d61a9dca203162097ef938f9482d5b7b597b21a 100644 (file)
--- a/src/desktop-entry.c
+++ b/src/desktop-entry.c
@@ -108,6 +108,18 @@ desktop_entry_init(struct server *server)
        sfdo->icon_theme = sfdo_icon_theme_load(
                sfdo->icon_ctx,
                rc.icon_theme_name, load_options);
+       if (!sfdo->icon_theme) {
+               /*
+                * sfdo_icon_theme_load() falls back to hicolor theme with
+                * _ALLOW_MISSING flag when the theme is missing, but just
+                * fails when the theme is invalid.
+                * So manually call sfdo_icon_theme_load() again here.
+                */
+               wlr_log(WLR_ERROR, "Failed to load icon theme %s, falling back to 'hicolor'",
+                       rc.icon_theme_name);
+               sfdo->icon_theme = sfdo_icon_theme_load(
+                       sfdo->icon_ctx, "hicolor", load_options);
+       }
        if (!sfdo->icon_theme) {
                goto err_icon_theme;
        }