circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-17 18:08:51 +00:00
Code Issues Projects Releases Wiki Activity

Check missed during merge.

Browse Source
This commit is contained in:
Nicholas Marriott 2017-10-12 11:56:06 +01:00
parent 4efd41f3af
commit d10def5b0b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server-client.c
View File

@ -1067,7 +1067,7 @@ server_client_resize_force(struct window_pane *wp)
memset(&ws, 0, sizeof ws); memset(&ws, 0, sizeof ws);
ws.ws_col = wp->sx; ws.ws_col = wp->sx;
ws.ws_row = wp->sy - 1; ws.ws_row = wp->sy - 1;
if (ioctl(wp->fd, TIOCSWINSZ, &ws) == -1) if (wp->fd != -1 && ioctl(wp->fd, TIOCSWINSZ, &ws) == -1)
#ifdef __sun #ifdef __sun
if (errno != EINVAL && errno != ENXIO) if (errno != EINVAL && errno != ENXIO)
#endif #endif
@ -1096,7 +1096,7 @@ server_client_resize_event(__unused int fd, __unused short events, void *data)
memset(&ws, 0, sizeof ws); memset(&ws, 0, sizeof ws);
ws.ws_col = wp->sx; ws.ws_col = wp->sx;
ws.ws_row = wp->sy; ws.ws_row = wp->sy;
if (ioctl(wp->fd, TIOCSWINSZ, &ws) == -1) if (wp->fd != -1 && ioctl(wp->fd, TIOCSWINSZ, &ws) == -1)
#ifdef __sun #ifdef __sun
/* /*
* Some versions of Solaris apparently can return an error when * Some versions of Solaris apparently can return an error when