diff options
author | Drew DeVault <sir@cmpwn.com> | 2016-05-14 10:52:41 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2016-05-14 10:52:41 -0400 |
commit | 6780aa34fc22cb4be24091487b7e01fdc74d1b31 (patch) | |
tree | 7025c24c0faba8bd7096661abe7c862c066ceb83 | |
parent | Merge pull request #653 from Hummer12007/patch-1 (diff) | |
parent | Revert "sway/container.c: fix segfault where view is assigned prematurely" (diff) | |
download | sway-6780aa34fc22cb4be24091487b7e01fdc74d1b31.tar.gz sway-6780aa34fc22cb4be24091487b7e01fdc74d1b31.tar.zst sway-6780aa34fc22cb4be24091487b7e01fdc74d1b31.zip |
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.c | 2 |
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; |