aboutsummaryrefslogtreecommitdiff
path: root/sway/container.c
diff options
context:
space:
mode:
authorZandr Martin <zandrmartin@gmail.com>2016-07-02 08:14:40 -0500
committerZandr Martin <zandrmartin@gmail.com>2016-07-02 08:14:40 -0500
commit034410819d4c8ea28105c5a5eef0563635a36a9d (patch)
treef24f60afd5ee641bddc78e6b16a8035e3abf7469 /sway/container.c
parentcbbeeb2cc3037d7538c7124e6ac0fe9e239731bb (diff)
parent7144fb9fc3b3d3b45d23deaab6a10caf3216cca4 (diff)
Merge remote-tracking branch 'upstream/master' into set-size-command
Diffstat (limited to 'sway/container.c')
-rw-r--r--sway/container.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/container.c b/sway/container.c
index 15975064..21538ab4 100644
--- a/sway/container.c
+++ b/sway/container.c
@@ -853,12 +853,12 @@ swayc_t *swayc_tabbed_stacked_parent(swayc_t *view) {
if (!ASSERT_NONNULL(view)) {
return NULL;
}
- do {
+ while (view->type != C_WORKSPACE && view->parent) {
view = view->parent;
if (view->layout == L_TABBED || view->layout == L_STACKED) {
parent = view;
}
- } while (view && view->type != C_WORKSPACE);
+ }
return parent;
}