diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-22 22:19:22 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-22 22:19:22 +0100 |
| commit | bd73ae1bc63a3b0187ffe7fc8f0caee5a4eb66fa (patch) | |
| tree | d9751f345771167b03f3bb48446674e9d6a00628 /src | |
| parent | 2cd5bb2505acc001933e97cf788f473f8db60895 (diff) | |
| download | vim-git-bd73ae1bc63a3b0187ffe7fc8f0caee5a4eb66fa.tar.gz | |
patch 7.4.1393v7.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)
Diffstat (limited to 'src')
| -rw-r--r-- | src/channel.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/channel.c b/src/channel.c index aa97088b4..f189ac043 100644 --- a/src/channel.c +++ b/src/channel.c @@ -1706,9 +1706,9 @@ channel_read(channel_T *channel, int part, char *func) } #endif - /* Reading a socket disconnection (readlen == 0), or a socket error. + /* Reading a disconnection (readlen == 0), or an error. * 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 * terminate the netbeans session later. Do not end the session here diff --git a/src/version.c b/src/version.c index b54558184..15409a6b3 100644 --- a/src/version.c +++ b/src/version.c @@ -749,6 +749,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1393, +/**/ 1392, /**/ 1391, |