mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-29 19:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipc: handle NULL cases for node_get_output

Browse source
This commit is contained in:
Ian Fan 2018-09-15 09:42:46 +01:00
parent 1c292fd43a
commit 34dbbb1314
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sway/ipc-json.c
View file

@ -316,9 +316,12 @@ static void focus_inactive_children_iterator(struct sway_node *node,
struct focus_inactive_data *data = _data; struct focus_inactive_data *data = _data;
json_object *focus = data->object; json_object *focus = data->object;
if (data->node == &root->node) { if (data->node == &root->node) {
int len = json_object_array_length(focus);
struct sway_output *output = node_get_output(node); struct sway_output *output = node_get_output(node);
if (output == NULL) {
return;
}
size_t id = output->node.id; size_t id = output->node.id;
int len = json_object_array_length(focus);
for (int i = 0; i < len; ++i) { for (int i = 0; i < len; ++i) {
if ((size_t) json_object_get_int(json_object_array_get_idx(focus, i)) == id) { if ((size_t) json_object_get_int(json_object_array_get_idx(focus, i)) == id) {
return; return;

6
sway/tree/node.c
View file

@ -74,8 +74,10 @@ void node_get_box(struct sway_node *node, struct wlr_box *box) {
struct sway_output *node_get_output(struct sway_node *node) { struct sway_output *node_get_output(struct sway_node *node) {
switch (node->type) { switch (node->type) {
case N_CONTAINER: case N_CONTAINER: {
return node->sway_container->workspace->output; struct sway_workspace *ws = node->sway_container->workspace;
return ws ? ws->output : NULL;
}
case N_WORKSPACE: case N_WORKSPACE:
return node->sway_workspace->output; return node->sway_workspace->output;
case N_OUTPUT: case N_OUTPUT: