summaryrefslogtreecommitdiff
path: root/sway/ipc-json.c
diff options
context:
space:
mode:
authorRyan Dwyer <[email protected]>2018-05-30 11:53:20 +1000
committerGitHub <[email protected]>2018-05-30 11:53:20 +1000
commit536773e3a1dab6662d371f0f7ee462a4802ae6df (patch)
tree62668d1e573c2b7a898b39abf8c8f6cacf2d4367 /sway/ipc-json.c
parent86b8d036d41f20d6c5e4bf4cb686e917701c72b6 (diff)
parent64225b1137f1dccb196de404105aeb45616ea988 (diff)
Merge pull request #2065 from RedSoxFan/fix-2018
Fix #2018 - Moving containers out of tabs/stacks
Diffstat (limited to 'sway/ipc-json.c')
-rw-r--r--sway/ipc-json.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index 0233a36e..03582950 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
@@ -160,11 +160,8 @@ static void ipc_json_describe_view(struct sway_container *c, json_object *object
json_object_object_add(object, "type", json_object_new_string("con"));
if (c->parent) {
- enum sway_container_layout layout = (c->parent->type == C_CONTAINER) ?
- c->parent->layout : c->layout;
-
json_object_object_add(object, "layout",
- json_object_new_string(ipc_json_layout_description(layout)));
+ json_object_new_string(ipc_json_layout_description(c->layout)));
}
}