zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-19 16:42:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #457 from ailin-nemui/fix_450

Browse source 
fix race condition in terminal init
This commit is contained in:
ailin-nemui 2016-03-22 22:57:28 +01:00
commit 29e160f0bf
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/fe-text/terminfo-core.c
View file

@ -504,7 +504,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); tcgetattr(fileno(term->in), &term->old_tio);
memcpy(&term->tio, &term->old_tio, sizeof(term->tio)); memcpy(&term->tio, &term->old_tio, sizeof(term->tio));
@ -526,8 +526,11 @@ static void terminfo_input_init(TERM_REC *term)
term->tio.c_cc[VSUSP] = _POSIX_VDISABLE; term->tio.c_cc[VSUSP] = _POSIX_VDISABLE;
#endif #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) static void terminfo_input_deinit(TERM_REC *term)
@ -687,6 +690,7 @@ static int term_setup(TERM_REC *term)
term->beep = term->TI_bel ? _beep : _ignore; term->beep = term->TI_bel ? _beep : _ignore;
terminfo_setup_colors(term, FALSE); terminfo_setup_colors(term, FALSE);
terminfo_input_init0(term);
terminfo_cont(term); terminfo_cont(term);
return 1; return 1;
} }