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