Merge pull request #716 from Hummer12007/patch-1

Added a null check in tabbed_stacked_parent

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;
 }