Merge branch 'master' into next

[i3/i3] / src / ipc.c

diff --git a/src/ipc.c b/src/ipc.c
index 577538c20ddf27af6de40bacffb37158f2477e2c..a7b46f62c978c69e96025bd7f1588649e4ab72dc 100644 (file)
--- 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");