alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix crashes when running certain commands on an empty workspace

Browse source 
This fixes crashes when running the border, mark, unmark and
title_format commands on an empty workspace.
This commit is contained in:
Ryan Dwyer 2018-10-17 19:55:00 +10:00
parent 434cbaabf0
commit 17014c34e2
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sway/commands/border.c
View file

@ -59,7 +59,7 @@ struct cmd_results *cmd_border(int argc, char **argv) {
}
struct sway_container *container = config->handler_context.container;
if (!container->view) {
if (!container || !container->view) {
return cmd_results_new(CMD_INVALID, "border",
"Only views can have borders");
}

2
sway/commands/mark.c
View file

@ -19,7 +19,7 @@ struct cmd_results *cmd_mark(int argc, char **argv) {
return error;
}
struct sway_container *container = config->handler_context.container;
if (!container->view) {
if (!container || !container->view) {
return cmd_results_new(CMD_INVALID, "mark",
"Only views can have marks");
}

2
sway/commands/title_format.c
View file

@ -12,7 +12,7 @@ struct cmd_results *cmd_title_format(int argc, char **argv) {
return error;
}
struct sway_container *container = config->handler_context.container;
if (!container->view) {
if (!container || !container->view) {
return cmd_results_new(CMD_INVALID, "title_format",
"Only views can have a title_format");
}

2
sway/commands/unmark.c
View file

@ -25,7 +25,7 @@ struct cmd_results *cmd_unmark(int argc, char **argv) {
struct sway_view *view = NULL;
if (config->handler_context.using_criteria) {
struct sway_container *container = config->handler_context.container;
if (!container->view) {
if (!container || !container->view) {
return cmd_results_new(CMD_INVALID, "unmark",
"Only views can have marks");
}