diff options
author | Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-10-12 09:21:48 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-12 09:21:48 +1000 |
commit | f52af18e0d5e9eb1b28f237192cb9c22656e3247 (patch) | |
tree | 3bd74d7ffd9bf2c3fbb05fe0efd377486851cfa0 | |
parent | Merge pull request #2824 from chtison/master (diff) | |
parent | Merge branch 'master' into master (diff) | |
download | sway-f52af18e0d5e9eb1b28f237192cb9c22656e3247.tar.gz sway-f52af18e0d5e9eb1b28f237192cb9c22656e3247.tar.zst sway-f52af18e0d5e9eb1b28f237192cb9c22656e3247.zip |
Merge pull request #2821 from meakio/master
fix: cmd_sticky crash sway with empty container
-rw-r--r-- | sway/commands/sticky.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sway/commands/sticky.c b/sway/commands/sticky.c index 7995cdd6..f18322b7 100644 --- a/sway/commands/sticky.c +++ b/sway/commands/sticky.c | |||
@@ -16,6 +16,11 @@ struct cmd_results *cmd_sticky(int argc, char **argv) { | |||
16 | return error; | 16 | return error; |
17 | } | 17 | } |
18 | struct sway_container *container = config->handler_context.container; | 18 | struct sway_container *container = config->handler_context.container; |
19 | |||
20 | if (container == NULL) { | ||
21 | return cmd_results_new(CMD_FAILURE, "sticky", "No current container"); | ||
22 | }; | ||
23 | |||
19 | if (!container_is_floating(container)) { | 24 | if (!container_is_floating(container)) { |
20 | return cmd_results_new(CMD_FAILURE, "sticky", | 25 | return cmd_results_new(CMD_FAILURE, "sticky", |
21 | "Can't set sticky on a tiled container"); | 26 | "Can't set sticky on a tiled container"); |