Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2014-01-13 23:35:22 +01:00
commit cd0cd0c3d2
1 changed files with 0 additions and 2 deletions

View File

@ -288,8 +288,6 @@ static unsigned char *get_buffer(ev_io *watcher, int *ret_buffer_len) {
/* end of file, kill the watcher */ /* end of file, kill the watcher */
ELOG("stdin: received EOF\n"); ELOG("stdin: received EOF\n");
cleanup(); cleanup();
set_statusline_error("Received EOF from statusline process");
draw_bars(false);
*ret_buffer_len = -1; *ret_buffer_len = -1;
return NULL; return NULL;
} }