averello/macvim-mirror
1
0
Fork 0
mirror of https://github.com/macvim-dev/macvim.git synced 2026-06-07 15:37:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #651 from ichizok/fix/gui-channel

Browse Source 
Don't associate a single fd with both channel out and err
This commit is contained in:
Kazuki Sakamoto
2018-03-22 07:13:09 -07:00
committed by GitHub
parent bdc1c5a229 14b995a71a
commit 4b08a13191
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/channel.c
+11 -4
View File
@@ -1028,11 +1028,18 @@ channel_set_pipes(channel_T *channel, sock_T in, sock_T out, sock_T err)
channel_gui_unregister_one(channel, PART_ERR);
# endif
ch_close_part(channel, PART_ERR);
channel->CH_ERR_FD = err;
channel->ch_to_be_closed |= (1 << PART_ERR);
# if defined(FEAT_GUI)
channel_gui_register_one(channel, PART_ERR);
# if defined(FEAT_GUI_MACVIM)
if (err == out && gui.in_use)
channel->CH_ERR_FD = INVALID_FD;
else
# endif
{
channel->CH_ERR_FD = err;
channel->ch_to_be_closed |= (1 << PART_ERR);
# if defined(FEAT_GUI)
channel_gui_register_one(channel, PART_ERR);
# endif
}
}
}