Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2014-07-11 00:33:13 +02:00
commit c2ccfc7e60

View File

@ -371,7 +371,7 @@ void stdin_io_first_line_cb(struct ev_loop *loop, ev_io *watcher, int revents) {
if (config.hide_on_modifier) { if (config.hide_on_modifier) {
stop_child(); stop_child();
} }
read_json_input(buffer + consumed, rec - consumed); draw_bars(read_json_input(buffer + consumed, rec - consumed));
} else { } else {
/* In case of plaintext, we just add a single block and change its /* In case of plaintext, we just add a single block and change its
* full_text pointer later. */ * full_text pointer later. */