diff options
| author | Thomas Adam <thomas.adam@smoothwall.net> | 2013-01-30 15:27:19 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas.adam@smoothwall.net> | 2013-01-30 15:27:19 +0000 |
| commit | a3f4eb7b24ee98b4a499ca52c29ec2e29f33aa76 (patch) | |
| tree | fc72465468b26b578f9546eede2a3f7334442928 /server-client.c | |
| parent | 2ca8b7f3593ec5a88c9f56a43f5076800957a0db (diff) | |
| parent | fdbfc7e3498e1cdd04e8df58aa1a937ee4d79caa (diff) | |
| download | rtmux-a3f4eb7b24ee98b4a499ca52c29ec2e29f33aa76.tar.gz rtmux-a3f4eb7b24ee98b4a499ca52c29ec2e29f33aa76.tar.bz2 rtmux-a3f4eb7b24ee98b4a499ca52c29ec2e29f33aa76.zip | |
Merge branch 'obsd-master'
Conflicts:
Makefile
grid-utf8.c
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server-client.c b/server-client.c index ece11ac5..aa44a4a5 100644 --- a/server-client.c +++ b/server-client.c @@ -333,12 +333,12 @@ server_client_assume_paste(struct session *s) u_int t; if ((t = options_get_number(&s->options, "assume-paste-time")) == 0) - return 0; + return (0); timersub(&s->activity_time, &s->last_activity_time, &tv); if (tv.tv_sec == 0 && tv.tv_usec < t * 1000) - return 1; - return 0; + return (1); + return (0); } /* Handle data key input from client. */ |