mirror of https://github.com/MidnightCommander/mc
Merge branch '3121_empty_subshell_prompt'
* 3121_empty_subshell_prompt: Ticket #3121: don't clear subshell prompt during its reading.
This commit is contained in:
commit
1d845d0dc5
|
@ -1585,7 +1585,6 @@ read_subshell_prompt (void)
|
||||||
int rc = 0;
|
int rc = 0;
|
||||||
ssize_t bytes = 0;
|
ssize_t bytes = 0;
|
||||||
struct timeval timeleft = { 0, 0 };
|
struct timeval timeleft = { 0, 0 };
|
||||||
gboolean should_reset_prompt = TRUE;
|
|
||||||
gboolean got_new_prompt = FALSE;
|
gboolean got_new_prompt = FALSE;
|
||||||
|
|
||||||
fd_set tmp;
|
fd_set tmp;
|
||||||
|
@ -1611,11 +1610,6 @@ read_subshell_prompt (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
bytes = read (mc_global.tty.subshell_pty, pty_buffer, sizeof (pty_buffer));
|
bytes = read (mc_global.tty.subshell_pty, pty_buffer, sizeof (pty_buffer));
|
||||||
if (should_reset_prompt)
|
|
||||||
{
|
|
||||||
should_reset_prompt = FALSE;
|
|
||||||
clear_subshell_prompt_string ();
|
|
||||||
}
|
|
||||||
|
|
||||||
parse_subshell_prompt_string (pty_buffer, bytes);
|
parse_subshell_prompt_string (pty_buffer, bytes);
|
||||||
got_new_prompt = TRUE;
|
got_new_prompt = TRUE;
|
||||||
|
|
Loading…
Reference in New Issue