aboutsummaryrefslogtreecommitdiffstats
path: root/sway
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2016-05-14 14:34:25 +0000
committerLibravatar Drew DeVault <sir@cmpwn.com>2016-05-14 14:34:25 +0000
commit5b0af661b0b369a4edba71eb3c5d0a9ad81428ce (patch)
tree7025c24c0faba8bd7096661abe7c862c066ceb83 /sway
parentMerge pull request #653 from Hummer12007/patch-1 (diff)
downloadsway-5b0af661b0b369a4edba71eb3c5d0a9ad81428ce.tar.gz
sway-5b0af661b0b369a4edba71eb3c5d0a9ad81428ce.tar.zst
sway-5b0af661b0b369a4edba71eb3c5d0a9ad81428ce.zip
Revert "sway/container.c: fix segfault where view is assigned prematurely"
Diffstat (limited to 'sway')
-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) {
820 return NULL; 820 return NULL;
821 } 821 }
822 do { 822 do {
823 view = view->parent;
823 if (view->layout == L_TABBED || view->layout == L_STACKED) { 824 if (view->layout == L_TABBED || view->layout == L_STACKED) {
824 parent = view; 825 parent = view;
825 } 826 }
826 view = view->parent;
827 } while (view && view->type != C_WORKSPACE); 827 } while (view && view->type != C_WORKSPACE);
828 828
829 return parent; 829 return parent;