Merge branch 'master' into next

2011-08-28 17:41:23 +02:00 · 2011-08-28 17:41:23 +02:00 · 57e7266da4
parent f0a0236b7b 3950aa730c
commit 57e7266da4
1 changed files with 4 additions and 1 deletions
--- a/src/ipc.c
+++ b/src/ipc.c
@ -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");