0
0
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00

patch 7.4.1393

Problem:    Starting a job hangs in the GUI. (Takuya Fujiwara)
Solution:   Don't check if ch_job is NULL when checking for an error.
            (Yasuhiro Matsumoto)
This commit is contained in:
Bram Moolenaar
2016-02-22 22:19:22 +01:00
parent 2cd5bb2505
commit bd73ae1bc6
2 changed files with 4 additions and 2 deletions

View File

@@ -1706,9 +1706,9 @@ channel_read(channel_T *channel, int part, char *func)
} }
#endif #endif
/* Reading a socket disconnection (readlen == 0), or a socket error. /* Reading a disconnection (readlen == 0), or an error.
* TODO: call error callback. */ * TODO: call error callback. */
if (readlen <= 0 && channel->ch_job == NULL) if (readlen <= 0)
{ {
/* Queue a "DETACH" netbeans message in the command queue in order to /* Queue a "DETACH" netbeans message in the command queue in order to
* terminate the netbeans session later. Do not end the session here * terminate the netbeans session later. Do not end the session here

View File

@@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1393,
/**/ /**/
1392, 1392,
/**/ /**/