diff options
| author | Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-05-12 17:52:51 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-12 17:52:51 +1000 |
| commit | 4717c71da54a45f736bdfde04ee3f0db88918799 (patch) | |
| tree | fa511907ae4ca82d8ca68cc3a2be254359af091f /sway/commands/default_border.c | |
| parent | 935bda0f336bb9ca45a7fb96d7ed5f08ef04432f (diff) | |
| parent | 2511adffc29996b64d01d85b3de31de9a2af9096 (diff) | |
Merge branch 'master' into fix-crash-on-fullscreen
Diffstat (limited to 'sway/commands/default_border.c')
| -rw-r--r-- | sway/commands/default_border.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/commands/default_border.c b/sway/commands/default_border.c index fcd2c075..2e356d3d 100644 --- a/sway/commands/default_border.c +++ b/sway/commands/default_border.c @@ -15,12 +15,12 @@ struct cmd_results *cmd_default_border(int argc, char **argv) { config->border = B_NORMAL; } else if (strcmp(argv[0], "pixel") == 0) { config->border = B_PIXEL; - if (argc == 2) { - config->border_thickness = atoi(argv[1]); - } } else { return cmd_results_new(CMD_INVALID, "default_border", - "Expected 'default_border <none|normal|pixel>' or 'default_border pixel <px>'"); + "Expected 'default_border <none|normal|pixel>' or 'default_border <normal|pixel> <px>'"); + } + if (argc == 2) { + config->border_thickness = atoi(argv[1]); } return cmd_results_new(CMD_SUCCESS, NULL, NULL); |