mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-03 09:01:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

return after disconnect ipc client and minor checks

Browse source
This commit is contained in:
taiyu 2015-09-29 07:19:10 -07:00
parent fe3b85d65f
commit c963aa7ced
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sway/ipc.c
View file

@ -253,7 +253,7 @@ void ipc_client_handle_command(struct ipc_client *client) {
default: default:
sway_log(L_INFO, "Unknown IPC command type %i", client->current_command); sway_log(L_INFO, "Unknown IPC command type %i", client->current_command);
ipc_client_disconnect(client); ipc_client_disconnect(client);
break; return;
} }
client->payload_length = 0; client->payload_length = 0;

4
sway/resize.c
View file

@ -20,7 +20,7 @@ bool resize_tiled(int amount, bool use_width) {
int lnumber = 0; int lnumber = 0;
int rnumber = 0; int rnumber = 0;
while (parent->parent) { while (parent->parent) {
if (parent->parent->layout == L_HORIZ) { if (parent->parent->layout == L_HORIZ && parent->parent->children) {
for (i = 0; i < parent->parent->children->length; i++) { for (i = 0; i < parent->parent->children->length; i++) {
sibling = parent->parent->children->items[i]; sibling = parent->parent->children->items[i];
if (sibling->x != focused->x) { if (sibling->x != focused->x) {
@ -143,7 +143,7 @@ bool resize_tiled(int amount, bool use_width) {
} }
parent = parent->parent; parent = parent->parent;
} }
if (parent == &root_container) { if (parent->parent == NULL || parent->parent->children == NULL) {
return true; return true;
} }
sway_log(L_DEBUG, "Found the proper parent: %p. It has %d b conts, and %d t conts", parent->parent, bnumber, tnumber); sway_log(L_DEBUG, "Found the proper parent: %p. It has %d b conts, and %d t conts", parent->parent, bnumber, tnumber);