From bd73ae1bc63a3b0187ffe7fc8f0caee5a4eb66fa Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 22 Feb 2016 22:19:22 +0100 Subject: [PATCH] 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) --- src/channel.c | 4 ++-- 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 @@ -748,6 +748,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1393, /**/ 1392, /**/