Merge branch 'fix-i3bar-input'
This commit is contained in:
commit
b7a3d8505b
@ -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();
|
||||||
|
Loading…
Reference in New Issue
Block a user