[PATCH 2/2] [main] unset keyboard if splash fails to show

Scott James Remnant scott at ubuntu.com
Thu Mar 11 12:26:36 PST 2010


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 |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main.c b/src/main.c
index 71e552c..aebab61 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;
-- 
1.7.0



More information about the plymouth mailing list