summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2009-05-22 17:50:20 +0100
committerLennart Poettering <lennart@poettering.net>2009-05-27 01:39:03 +0200
commitb8642bde955cee9711c9d26c4b221841e924e6c4 (patch)
tree33d8770e0226b040bd5b69ba81a8ae064caf355d
parentc2f5faef97643ef21ff86308c062165e19bad2c2 (diff)
Missing fallback theme breaks the user specified one
If the fallback theme doesn't exist it stops any user specified theme from being used. The patch below stops the failure from the fallback theme from propagating and hence the user specified theme works as expected.
-rw-r--r--src/sound-theme-spec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sound-theme-spec.c b/src/sound-theme-spec.c
index 46bd5c4..3f8a9a9 100644
--- a/src/sound-theme-spec.c
+++ b/src/sound-theme-spec.c
@@ -398,9 +398,9 @@ static int load_theme_data(ca_theme_data **_t, const char *name) {
if ((ret = load_theme_dir(t, name)) < 0)
goto fail;
+ /* The fallback theme may intentionally not exist so ignore failure */
if (!t->loaded_fallback_theme)
- if ((ret = load_theme_dir(t, FALLBACK_THEME)) < 0)
- goto fail;
+ load_theme_dir(t, FALLBACK_THEME);
if (*_t)
ca_theme_data_free(*_t);