From 8c390bea97ccd2c0f74f63fd90d549dd4f488651 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 7 May 2010 14:49:09 -0400 Subject: [PATCH] [terminal] Don't stomp over original tty lock settings We were repetedly saving over the original tty lock settings, causing the tty to stay locked after boot up. --- src/libply-splash-core/ply-terminal.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libply-splash-core/ply-terminal.c b/src/libply-splash-core/ply-terminal.c index f71f25af..ff59d719 100644 --- a/src/libply-splash-core/ply-terminal.c +++ b/src/libply-splash-core/ply-terminal.c @@ -188,7 +188,8 @@ ply_terminal_set_unbuffered_input (ply_terminal_t *terminal) if (tcsetattr (terminal->fd, TCSANOW, &term_attributes) != 0) return false; - if (ioctl (terminal->fd, TIOCGLCKTRMIOS, &locked_term_attributes) == 0) + if (!terminal->original_locked_term_attributes_saved && + ioctl (terminal->fd, TIOCGLCKTRMIOS, &locked_term_attributes) == 0) { terminal->original_locked_term_attributes = locked_term_attributes; terminal->original_locked_term_attributes_saved = true;