]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
[main] unset keyboard if splash fails to show
authorScott James Remnant <scott@ubuntu.com>
Thu, 11 Mar 2010 20:26:36 +0000 (20:26 +0000)
committerScott James Remnant <scott@ubuntu.com>
Thu, 18 Mar 2010 19:50:44 +0000 (19:50 +0000)
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

src/main.c

index 71e552c3f1e8190e46387ac5112bd965c72a0d57..aebab617785fdb9988e5baf042481e1103c0f71a 100644 (file)
@@ -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;