aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFurkan Sahin <furkan-dev@proton.me>2016-05-14 10:52:41 -0400
committerFurkan Sahin <furkan-dev@proton.me>2016-05-14 10:52:41 -0400
commitc8daaeddb4d4931c6f627dc0e8d2141915235484 (patch)
tree7025c24c0faba8bd7096661abe7c862c066ceb83
parent010f008a72289eded066e90d1648a58710d9a8d6 (diff)
parent05c00356324b3399256adfb1320d14eff918ddba (diff)
Merge pull request #656 from SirCmpwn/revert-650-segfault
Revert "sway/container.c: fix segfault where view is assigned prematurely"
-rw-r--r--sway/container.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/container.c b/sway/container.c
index 1a15aae1..b49b32ee 100644
--- a/sway/container.c
+++ b/sway/container.c
@@ -820,10 +820,10 @@ swayc_t *swayc_tabbed_stacked_parent(swayc_t *view) {
return NULL;
}
do {
+ view = view->parent;
if (view->layout == L_TABBED || view->layout == L_STACKED) {
parent = view;
}
- view = view->parent;
} while (view && view->type != C_WORKSPACE);
return parent;