sway

commit cdb6a9e94855e75fa20e14b766632dada3410292
parent 3ce8cc807753119104d8836b6c77e19fd644a878
Author: Drew DeVault <sir@cmpwn.com>
Date:   Sat, 18 Jun 2016 13:45:39 -0400

Merge pull request #716 from Hummer12007/patch-1

Added a null check in tabbed_stacked_parent
Diffstat:
M
sway/container.c
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git 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;
 }