Merge branch 'master' into next
This commit is contained in:
commit
57e7266da4
|
@ -248,7 +248,10 @@ void dump_node(yajl_gen gen, struct Con *con, bool inplace_restart) {
|
|||
dump_rect(gen, "geometry", con->geometry);
|
||||
|
||||
ystr("name");
|
||||
ystr(con->name);
|
||||
if (con->window && con->window->name_json)
|
||||
ystr(con->window->name_json);
|
||||
else
|
||||
ystr(con->name);
|
||||
|
||||
if (con->type == CT_WORKSPACE) {
|
||||
ystr("num");
|
||||
|
|
Loading…
Reference in New Issue