mirror of
https://github.com/MidnightCommander/mc
synced 2024-12-22 20:36:50 +03:00
Merge branch '213_busy_shell'
* 213_busy_shell: Ticket #213 [mc-ru-fork] patch for fix bug 'The shell is already running a command'
This commit is contained in:
commit
890f268bf0
@ -573,6 +573,7 @@ int invoke_subshell (const char *command, int how, char **new_dir)
|
||||
subshell_state = ACTIVE;
|
||||
/* FIXME: possibly take out this hack; the user can
|
||||
re-play it by hitting C-hyphen a few times! */
|
||||
if (subshell_ready)
|
||||
write_all (subshell_pty, " \b", 2); /* Hack to make prompt reappear */
|
||||
}
|
||||
}
|
||||
@ -1052,6 +1053,8 @@ feed_subshell (int how, int fail_on_error)
|
||||
}
|
||||
|
||||
write_all (subshell_pty, pty_buffer, bytes);
|
||||
|
||||
if (pty_buffer[bytes-1] == '\n' || pty_buffer[bytes-1] == '\r')
|
||||
subshell_ready = FALSE;
|
||||
} else {
|
||||
return FALSE;
|
||||
|
Loading…
Reference in New Issue
Block a user