circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 13:37:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2015-08-28 10:01:08 +01:00
parent ce20572ace 25faca41eb
commit 031d7ce840
5 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
window.c
View File

@ -411,6 +411,7 @@ window_set_active_pane(struct window *w, struct window_pane *wp)
return (1);
}
w->active->active_point = next_active_point++;
w->active->flags |= PANE_CHANGED;
return (1);
}
@ -947,7 +948,7 @@ window_pane_read_callback(unused struct bufferevent *bufev, void *data)
*/
wp->window->flags |= WINDOW_SILENCE;
if (gettimeofday(&wp->window->silence_timer, NULL) != 0)
fatal("gettimeofday failed.");
fatal("gettimeofday failed");
return;
start_timer: