]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
[main] Fix crash when config files don't exist
authorRay Strode <rstrode@redhat.com>
Wed, 24 Mar 2010 03:26:05 +0000 (23:26 -0400)
committerRay Strode <rstrode@redhat.com>
Wed, 24 Mar 2010 03:26:05 +0000 (23:26 -0400)
I wasn't handling NULL return value correctly before.

src/main.c

index b823f8b4750cde4ae1a2d0fd7b5cf34a1a8d5f54..2ad123b54d74b6fdd76631494398c23785d53d27 100644 (file)
@@ -289,7 +289,8 @@ show_default_splash (state_t *state)
     }
 
   find_system_default_splash (state);
-  if (state->boot_splash == NULL)
+  if (state->boot_splash == NULL &&
+      state->system_default_splash_path != NULL)
     {
       ply_trace ("Trying system default splash");
       state->boot_splash = start_boot_splash (state,
@@ -297,7 +298,8 @@ show_default_splash (state_t *state)
     }
 
   find_distribution_default_splash (state);
-  if (state->boot_splash == NULL)
+  if (state->boot_splash == NULL &&
+      state->distribution_default_splash_path != NULL)
     {
       ply_trace ("Trying distribution default splash");
       state->boot_splash = start_boot_splash (state,