Mercurial > vim
comparison src/channel.c @ 8200:ee84450e604e v7.4.1393
commit https://github.com/vim/vim/commit/bd73ae1bc63a3b0187ffe7fc8f0caee5a4eb66fa
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Feb 22 22:19:22 2016 +0100
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)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Mon, 22 Feb 2016 22:30:05 +0100 |
| parents | f2286ff0c102 |
| children | 08d251a1c178 |
comparison
equal
deleted
inserted
replaced
| 8199:3c2f0e5cb555 | 8200:ee84450e604e |
|---|---|
| 1704 if (WSAGetLastError() == WSAEWOULDBLOCK) | 1704 if (WSAGetLastError() == WSAEWOULDBLOCK) |
| 1705 return; | 1705 return; |
| 1706 } | 1706 } |
| 1707 #endif | 1707 #endif |
| 1708 | 1708 |
| 1709 /* Reading a socket disconnection (readlen == 0), or a socket error. | 1709 /* Reading a disconnection (readlen == 0), or an error. |
| 1710 * TODO: call error callback. */ | 1710 * TODO: call error callback. */ |
| 1711 if (readlen <= 0 && channel->ch_job == NULL) | 1711 if (readlen <= 0) |
| 1712 { | 1712 { |
| 1713 /* Queue a "DETACH" netbeans message in the command queue in order to | 1713 /* Queue a "DETACH" netbeans message in the command queue in order to |
| 1714 * terminate the netbeans session later. Do not end the session here | 1714 * terminate the netbeans session later. Do not end the session here |
| 1715 * directly as we may be running in the context of a call to | 1715 * directly as we may be running in the context of a call to |
| 1716 * netbeans_parse_messages(): | 1716 * netbeans_parse_messages(): |