[main] Watch keyboard input after the splash had a chance to quit

If the splash hasn't picked up any displays it will abort. We wait for the
possible abort before attaching the keyboard. This is a slight hack as now
add_displays_and_keyboard_to_boot_splash no longer adds the keyboards. Also the
splash plugin can access the keyboard before it is officially opened.

For now it just fixes the terminal fd < 0 assertion bug.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/main.c b/src/main.c
index 0646ad8c..0373c14f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1343,14 +1343,12 @@ add_displays_and_keyboard_to_boot_splash (state_t           *state,
 
       ply_trace ("adding text display on boot splash");
       ply_boot_splash_add_text_display (splash, display);
 
       node = next_node;
     }
-
-  ply_keyboard_watch_for_input (state->keyboard);
 }
 
 static ply_boot_splash_t *
 start_boot_splash (state_t    *state,
                    const char *theme_path)
 {
@@ -1393,12 +1391,14 @@ start_boot_splash (state_t    *state,
       ply_boot_splash_unset_keyboard (splash);
       ply_boot_splash_free (splash);
       ply_restore_errno ();
       return NULL;
     }
 
+  ply_keyboard_watch_for_input (state->keyboard);
+
   update_display (state);
   return splash;
 }
 
 static bool
 attach_to_running_session (state_t *state)