From: Ray Strode <rstrode@redhat.com>
Date: Wed, 24 Mar 2010 03:26:05 +0000 (-0400)
Subject: [main] Fix crash when config files don't exist
X-Git-Tag: 0.8.0~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76617409da02175fa5e5e643b954b776b5211fe3;p=thirdparty%2Fplymouth.git

[main] Fix crash when config files don't exist

I wasn't handling NULL return value correctly before.
---

diff --git a/src/main.c b/src/main.c
index b823f8b4..2ad123b5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -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,