From: Ray Strode <rstrode@redhat.com>
Date: Mon, 29 Mar 2010 19:20:44 +0000 (-0400)
Subject: [main] watch keyboard input after displays are added
X-Git-Tag: 0.8.2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d3dd0c3bea2c58cef2184c761da6457dcbcc857;p=thirdparty%2Fplymouth.git

[main] watch keyboard input after displays are added

Since the boot splashes handle opening the terminal now,
we need to make sure that we don't try to watch for input on
the terminal until they've opened it.

This should fix some crashes users are reportedly seeing with
the details splash.

A potentially better fix would be to make watch_for_input defer
doing anything on its own using the terminal is opened.  That
would require a trigger and some new api to ply-terminal, I think.
---

diff --git a/src/main.c b/src/main.c
index d3d670dd..0646ad8c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1220,7 +1220,6 @@ set_keyboard (state_t        *state,
   ply_keyboard_add_enter_handler (keyboard,
                                   (ply_keyboard_enter_handler_t)
                                   on_enter, state);
-  ply_keyboard_watch_for_input (keyboard);
 }
 static void
 add_display_and_keyboard_for_terminal (state_t    *state,
@@ -1347,6 +1346,8 @@ add_displays_and_keyboard_to_boot_splash (state_t           *state,
 
       node = next_node;
     }
+
+  ply_keyboard_watch_for_input (state->keyboard);
 }
 
 static ply_boot_splash_t *