Merge branch 'fix-ipc-name'

This commit is contained in:
Michael Stapelberg 2011-08-28 17:40:15 +02:00
commit 3950aa730c
1 changed files with 4 additions and 1 deletions

View File

@ -243,7 +243,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");