Merge pull request #716 from Hummer12007/patch-1

Added a null check in tabbed_stacked_parent
master
Drew DeVault 9 years ago committed by GitHub
commit cdb6a9e948

@ -853,12 +853,12 @@ swayc_t *swayc_tabbed_stacked_parent(swayc_t *view) {
if (!ASSERT_NONNULL(view)) { if (!ASSERT_NONNULL(view)) {
return NULL; return NULL;
} }
do { while (view->type != C_WORKSPACE && view->parent) {
view = view->parent; view = view->parent;
if (view->layout == L_TABBED || view->layout == L_STACKED) { if (view->layout == L_TABBED || view->layout == L_STACKED) {
parent = view; parent = view;
} }
} while (view && view->type != C_WORKSPACE); }
return parent; return parent;
} }

Loading…
Cancel
Save