nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2011-08-25 18:51:02 +02:00
parent e411223f8b b7a3d8505b
commit c7ac1f9077
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
i3bar/src/child.c
View File

@ -40,6 +40,8 @@ void cleanup() {
ev_io_stop(main_loop, stdin_io); ev_io_stop(main_loop, stdin_io);
FREE(stdin_io); FREE(stdin_io);
FREE(statusline_buffer); FREE(statusline_buffer);
/* statusline pointed to memory within statusline_buffer */
statusline = NULL;
} }
if (child_sig != NULL) { if (child_sig != NULL) {
@ -78,9 +80,10 @@ void stdin_io_cb(struct ev_loop *loop, ev_io *watcher, int revents) {
} }
/* end of file, kill the watcher */ /* end of file, kill the watcher */
DLOG("stdin: EOF\n"); ELOG("stdin: received EOF\n");
cleanup(); cleanup();
break; draw_bars();
return;
} }
rec += n; rec += n;
@ -110,7 +113,7 @@ void stdin_io_cb(struct ev_loop *loop, ev_io *watcher, int revents) {
* *
*/ */
void child_sig_cb(struct ev_loop *loop, ev_child *watcher, int revents) { void child_sig_cb(struct ev_loop *loop, ev_child *watcher, int revents) {
DLOG("Child (pid: %d) unexpectedly exited with status %d\n", ELOG("Child (pid: %d) unexpectedly exited with status %d\n",
child_pid, child_pid,
watcher->rstatus); watcher->rstatus);
cleanup(); cleanup();