diff options
author | taiyu <taiyu.len@gmail.com> | 2015-09-29 07:19:10 -0700 |
---|---|---|
committer | taiyu <taiyu.len@gmail.com> | 2015-09-29 07:19:10 -0700 |
commit | c963aa7ceda5f5a5ea5d648ec291d62b74e84ac9 (patch) | |
tree | 92178627be2ef7e5d651bfaf075c3af52065697e /sway/resize.c | |
parent | Merge pull request #181 from taiyu-len/master (diff) | |
download | sway-c963aa7ceda5f5a5ea5d648ec291d62b74e84ac9.tar.gz sway-c963aa7ceda5f5a5ea5d648ec291d62b74e84ac9.tar.zst sway-c963aa7ceda5f5a5ea5d648ec291d62b74e84ac9.zip |
return after disconnect ipc client and minor checks
Diffstat (limited to 'sway/resize.c')
-rw-r--r-- | sway/resize.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/resize.c b/sway/resize.c index 22d520af..f1b1f4ae 100644 --- a/sway/resize.c +++ b/sway/resize.c | |||
@@ -20,7 +20,7 @@ bool resize_tiled(int amount, bool use_width) { | |||
20 | int lnumber = 0; | 20 | int lnumber = 0; |
21 | int rnumber = 0; | 21 | int rnumber = 0; |
22 | while (parent->parent) { | 22 | while (parent->parent) { |
23 | if (parent->parent->layout == L_HORIZ) { | 23 | if (parent->parent->layout == L_HORIZ && parent->parent->children) { |
24 | for (i = 0; i < parent->parent->children->length; i++) { | 24 | for (i = 0; i < parent->parent->children->length; i++) { |
25 | sibling = parent->parent->children->items[i]; | 25 | sibling = parent->parent->children->items[i]; |
26 | if (sibling->x != focused->x) { | 26 | if (sibling->x != focused->x) { |
@@ -143,7 +143,7 @@ bool resize_tiled(int amount, bool use_width) { | |||
143 | } | 143 | } |
144 | parent = parent->parent; | 144 | parent = parent->parent; |
145 | } | 145 | } |
146 | if (parent == &root_container) { | 146 | if (parent->parent == NULL || parent->parent->children == NULL) { |
147 | return true; | 147 | return true; |
148 | } | 148 | } |
149 | sway_log(L_DEBUG, "Found the proper parent: %p. It has %d b conts, and %d t conts", parent->parent, bnumber, tnumber); | 149 | sway_log(L_DEBUG, "Found the proper parent: %p. It has %d b conts, and %d t conts", parent->parent, bnumber, tnumber); |