diff options
| author | ailin-nemui <ailin-nemui@users.noreply.github.com> | 2016-03-22 22:57:28 +0100 |
|---|---|---|
| committer | ailin-nemui <ailin-nemui@users.noreply.github.com> | 2016-03-23 00:08:36 +0100 |
| commit | 5ef2b958d94af940746f607fb56776852c6b0a4d (patch) | |
| tree | 8bb78fa031415d480ebf5a0390545bafa28843ce /src | |
| parent | c657b9c3b1bf867722f63892251b2294d6a87d56 (diff) | |
| download | irssi-5ef2b958d94af940746f607fb56776852c6b0a4d.zip | |
Merge pull request #457 from ailin-nemui/fix_450
fix race condition in terminal init
Diffstat (limited to 'src')
| -rw-r--r-- | src/fe-text/terminfo-core.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/fe-text/terminfo-core.c b/src/fe-text/terminfo-core.c index 60927f1a..4db68cc7 100644 --- a/src/fe-text/terminfo-core.c +++ b/src/fe-text/terminfo-core.c @@ -496,7 +496,7 @@ void terminfo_setup_colors(TERM_REC *term, int force) } } -static void terminfo_input_init(TERM_REC *term) +static void terminfo_input_init0(TERM_REC *term) { tcgetattr(fileno(term->in), &term->old_tio); memcpy(&term->tio, &term->old_tio, sizeof(term->tio)); @@ -518,8 +518,11 @@ static void terminfo_input_init(TERM_REC *term) term->tio.c_cc[VSUSP] = _POSIX_VDISABLE; #endif - tcsetattr(fileno(term->in), TCSADRAIN, &term->tio); +} +static void terminfo_input_init(TERM_REC *term) +{ + tcsetattr(fileno(term->in), TCSADRAIN, &term->tio); } static void terminfo_input_deinit(TERM_REC *term) @@ -673,6 +676,7 @@ static int term_setup(TERM_REC *term) term->beep = term->TI_bel ? _beep : _ignore; terminfo_setup_colors(term, FALSE); + terminfo_input_init0(term); terminfo_cont(term); return 1; } |