Merge branch 'master' into next

[i3/i3] / i3bar / src / child.c

diff --git a/i3bar/src/child.c b/i3bar/src/child.c
index 79971a3aab7159975e8babaab1fd0ed00ec298c5..cfdf911c11442866176ce158293dd2952befcefc 100644 (file)
--- a/i3bar/src/child.c
+++ b/i3bar/src/child.c
@@ -266,6 +266,8 @@ static int stdin_end_array(void *context) {
 /*
  * Helper function to read stdin
  *
+ * Returns NULL on EOF.
+ *
  */
 static unsigned char *get_buffer(ev_io *watcher, int *ret_buffer_len) {
     int fd = watcher->fd;
@@ -285,11 +287,7 @@ static unsigned char *get_buffer(ev_io *watcher, int *ret_buffer_len) {
             exit(EXIT_FAILURE);
         }
         if (n == 0) {
-            /* end of file, kill the watcher */
             ELOG("stdin: received EOF\n");
-            cleanup();
-            set_statusline_error("Received EOF from statusline process");
-            draw_bars(false);
             *ret_buffer_len = -1;
             return NULL;
         }