summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharlie Brej <cbrej@cs.man.ac.uk>2010-03-29 21:56:11 (GMT)
committerCharlie Brej <cbrej@cs.man.ac.uk>2010-03-29 21:56:11 (GMT)
commit92cc20f82fbd0f650d8065204198b292b2f8153a (patch)
tree8beaa6f056f1226f79ee7dae5686a564096f2905
parent2d3dd0c3bea2c58cef2184c761da6457dcbcc857 (diff)
[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.
-rw-r--r--src/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c
index 0646ad8..0373c14 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1346,8 +1346,6 @@ 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 *
@@ -1396,6 +1394,8 @@ start_boot_splash (state_t *state,
return NULL;
}
+ ply_keyboard_watch_for_input (state->keyboard);
+
update_display (state);
return splash;
}