Merge pull request #2671 from emersion/output-execute-no-focus

Fix segfault when executing command without focus
master
emersion 6 years ago committed by GitHub
commit fa4308c5ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -216,18 +216,23 @@ struct cmd_handler *find_handler(char *line, struct cmd_handler *cmd_handlers,
static void set_config_node(struct sway_node *node) { static void set_config_node(struct sway_node *node) {
config->handler_context.node = node; config->handler_context.node = node;
config->handler_context.container = NULL;
config->handler_context.workspace = NULL;
if (node == NULL) {
return;
}
switch (node->type) { switch (node->type) {
case N_CONTAINER: case N_CONTAINER:
config->handler_context.container = node->sway_container; config->handler_context.container = node->sway_container;
config->handler_context.workspace = node->sway_container->workspace; config->handler_context.workspace = node->sway_container->workspace;
break; break;
case N_WORKSPACE: case N_WORKSPACE:
config->handler_context.container = NULL;
config->handler_context.workspace = node->sway_workspace; config->handler_context.workspace = node->sway_workspace;
break; break;
default: case N_ROOT:
config->handler_context.container = NULL; case N_OUTPUT:
config->handler_context.workspace = NULL;
break; break;
} }
} }

Loading…
Cancel
Save