fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2026-05-07 15:28:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'optional-theme' into 'master'

Browse source 
main: Don't bail out of load_settings if "Theme" is missing

See merge request plymouth/plymouth!109
This commit is contained in:
Ray Strode 2020-04-18 12:40:50 +00:00
commit 14e91cc8d2
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/main.c
View file

@ -278,19 +278,18 @@ load_settings (state_t *state,
splash_string = ply_key_file_get_value (key_file, "Daemon", "Theme");
if (splash_string == NULL)
goto out;
asprintf (theme_path,
PLYMOUTH_RUNTIME_THEME_PATH "%s/%s.plymouth",
splash_string, splash_string);
ply_trace ("Checking if %s exists", *theme_path);
if (!ply_file_exists (*theme_path)) {
ply_trace ("%s not found, fallbacking to " PLYMOUTH_THEME_PATH,
*theme_path);
if (splash_string != NULL) {
asprintf (theme_path,
PLYMOUTH_THEME_PATH "%s/%s.plymouth",
PLYMOUTH_RUNTIME_THEME_PATH "%s/%s.plymouth",
splash_string, splash_string);
ply_trace ("Checking if %s exists", *theme_path);
if (!ply_file_exists (*theme_path)) {
ply_trace ("%s not found, fallbacking to " PLYMOUTH_THEME_PATH,
*theme_path);
asprintf (theme_path,
PLYMOUTH_THEME_PATH "%s/%s.plymouth",
splash_string, splash_string);
}
}
if (isnan (state->splash_delay)) {