main: load default splash settings at start up

There's no reason to load them lazily, and when
we extend the functions to add a theme delay setting,
we're going to want to have the settings available as early as
possible.

diff --git a/src/main.c b/src/main.c
index 4c0f84364bf30de019ae4de839bd12a4020f8ce5..91dfe209ba93eb86cebd5b2a5548d268cf7765d8 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -406,14 +406,12 @@ show_default_splash (state_t *state)
     return;
 
   ply_trace ("Showing splash screen");
-  find_override_splash (state);
   if (state->override_splash_path != NULL)
     {
       ply_trace ("Trying override splash at '%s'", state->override_splash_path);
       state->boot_splash = show_theme (state, state->override_splash_path);
     }
 
-  find_system_default_splash (state);
   if (state->boot_splash == NULL &&
       state->system_default_splash_path != NULL)
     {
@@ -421,7 +419,6 @@ show_default_splash (state_t *state)
       state->boot_splash = show_theme (state, state->system_default_splash_path);
     }
 
-  find_distribution_default_splash (state);
   if (state->boot_splash == NULL &&
       state->distribution_default_splash_path != NULL)
     {
@@ -2227,6 +2224,10 @@ main (int    argc,
       return EX_UNAVAILABLE;
     }
 
+  find_override_splash (&state);
+  find_system_default_splash (&state);
+  find_distribution_default_splash (&state);
+
   if (command_line_has_argument (state.kernel_command_line, "plymouth.ignore-serial-consoles"))
     device_manager_flags |= PLY_DEVICE_MANAGER_FLAGS_IGNORE_SERIAL_CONSOLES;