aboutsummaryrefslogtreecommitdiff
path: root/sway/container.c
diff options
context:
space:
mode:
authorHummer12007 <hilobakho@gmail.com>2016-06-18 20:31:18 +0300
committerMykyta Holubakha <hilobakho@gmail.com>2016-06-18 20:40:39 +0300
commit7870a197fcdf4d6e77bea7133539d6637aba8479 (patch)
tree2591149dea0536a66624d9c1555c4ee15292aaec /sway/container.c
parent3ce8cc807753119104d8836b6c77e19fd644a878 (diff)
Added a null check in tabbed_stacked_parent
This fixes a segfault, when trying to get parent of the workspace/root container/(?), as it is not assuered that the view's parent node is not null in the loop
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;
}