diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-05-28 13:20:31 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-05-28 13:20:31 +0200 |
commit | bf981eeb6b4ee63ae8543a7f9865ab700159a79c (patch) | |
tree | b1b1480c2b36fb2bf813ababe30afdd00272b240 /src | |
parent | 5850a764eae74a4dae7238e4e76b4c24f062699b (diff) | |
download | vim-bf981eeb6b4ee63ae8543a7f9865ab700159a79c.zip |
patch 7.4.1850
Problem: GUI freezes when using a job. (Shougo)
Solution: Unregister the channel when there is an input error.
Diffstat (limited to 'src')
-rw-r--r-- | src/channel.c | 5 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/channel.c b/src/channel.c index 84dfcf7c0..f4dc323b6 100644 --- a/src/channel.c +++ b/src/channel.c @@ -2868,6 +2868,11 @@ channel_close_on_error(channel_T *channel, char *func) * died. Don't close the channel right away, it may be the wrong moment * to invoke callbacks. */ channel->ch_to_be_closed = TRUE; + +#ifdef FEAT_GUI + /* Stop listening to GUI events right away. */ + channel_gui_unregister(channel); +#endif } static void diff --git a/src/version.c b/src/version.c index 2a259a528..80793f10b 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1850, +/**/ 1849, /**/ 1848, |