diff options
author | Drew DeVault <sir@cmpwn.com> | 2016-06-18 13:45:39 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-18 13:45:39 -0400 |
commit | cdb6a9e94855e75fa20e14b766632dada3410292 (patch) | |
tree | 2591149dea0536a66624d9c1555c4ee15292aaec | |
parent | Merge pull request #709 from zandrmartin/set-size-command (diff) | |
parent | Added a null check in tabbed_stacked_parent (diff) | |
download | sway-cdb6a9e94855e75fa20e14b766632dada3410292.tar.gz sway-cdb6a9e94855e75fa20e14b766632dada3410292.tar.zst sway-cdb6a9e94855e75fa20e14b766632dada3410292.zip |
Merge pull request #716 from Hummer12007/patch-1
Added a null check in tabbed_stacked_parent
-rw-r--r-- | sway/container.c | 4 |
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) { | |||
853 | if (!ASSERT_NONNULL(view)) { | 853 | if (!ASSERT_NONNULL(view)) { |
854 | return NULL; | 854 | return NULL; |
855 | } | 855 | } |
856 | do { | 856 | while (view->type != C_WORKSPACE && view->parent) { |
857 | view = view->parent; | 857 | view = view->parent; |
858 | if (view->layout == L_TABBED || view->layout == L_STACKED) { | 858 | if (view->layout == L_TABBED || view->layout == L_STACKED) { |
859 | parent = view; | 859 | parent = view; |
860 | } | 860 | } |
861 | } while (view && view->type != C_WORKSPACE); | 861 | } |
862 | 862 | ||
863 | return parent; | 863 | return parent; |
864 | } | 864 | } |