Merge pull request #2821 from meakio/master

fix: cmd_sticky crash sway with empty container
This commit is contained in:
Ryan Dwyer 2018-10-12 09:21:48 +10:00 committed by GitHub
commit f52af18e0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -16,6 +16,11 @@ struct cmd_results *cmd_sticky(int argc, char **argv) {
return error; return error;
} }
struct sway_container *container = config->handler_context.container; struct sway_container *container = config->handler_context.container;
if (container == NULL) {
return cmd_results_new(CMD_FAILURE, "sticky", "No current container");
};
if (!container_is_floating(container)) { if (!container_is_floating(container)) {
return cmd_results_new(CMD_FAILURE, "sticky", return cmd_results_new(CMD_FAILURE, "sticky",
"Can't set sticky on a tiled container"); "Can't set sticky on a tiled container");