Merge branch 'obsd-master'

Conflicts:
	window-buffer.c
This commit is contained in:
Thomas Adam
2017-06-01 18:29:36 +01:00
8 changed files with 8 additions and 9 deletions

View File

@ -203,7 +203,7 @@ format_job_update(struct job *job)
log_debug("%s: %p %s: %s", __func__, fj, fj->cmd, fj->out);
t = time (NULL);
t = time(NULL);
if (fj->status && fj->last != t) {
if (fj->client != NULL)
server_status_client(fj->client);