From: Scott James Remnant <scott@ubuntu.com>
Date: Thu, 11 Mar 2010 20:26:36 +0000 (+0000)
Subject: [main] unset keyboard if splash fails to show
X-Git-Tag: 0.8.0~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56cccfc47f2a107e6815a4baeb7842a8ac1c271f;p=thirdparty%2Fplymouth.git

[main] unset keyboard if splash fails to show

Since script implements a set_keyboard function (the only plugin to
do so), the previous commit reveals a bug where set_keyboard is
called for the plugin but unset_keyboard isn't called if the plugin
fails to be loaded
---

diff --git a/src/main.c b/src/main.c
index 71e552c3..aebab617 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1185,6 +1185,7 @@ start_boot_splash (state_t    *state,
   if (!ply_boot_splash_show (splash, splash_mode))
     {
       ply_save_errno ();
+      ply_boot_splash_unset_keyboard (splash);
       ply_boot_splash_free (splash);
       ply_restore_errno ();
       return NULL;