diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2017-03-18 16:36:17 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-03-18 16:36:17 -0400 |
| commit | 5c3d3184a3241c3d30af3ec4a12522c2a7f3d297 (patch) | |
| tree | 23256a4f23d2c64925b3767db49d413225e1a1fe | |
| parent | Merge pull request #1121 from zandrmartin/registry-keyboard-caps (diff) | |
| parent | Merge branch 'master' into master (diff) | |
| download | sway-5c3d3184a3241c3d30af3ec4a12522c2a7f3d297.tar.gz sway-5c3d3184a3241c3d30af3ec4a12522c2a7f3d297.tar.zst sway-5c3d3184a3241c3d30af3ec4a12522c2a7f3d297.zip | |
Merge pull request #1119 from oranenj/master
Fix off-by-one error when checking workspace_layout arguments
| -rw-r--r-- | sway/commands/workspace_layout.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/commands/workspace_layout.c b/sway/commands/workspace_layout.c index a2a1a5a2..9ac84be2 100644 --- a/sway/commands/workspace_layout.c +++ b/sway/commands/workspace_layout.c | |||
| @@ -21,13 +21,13 @@ struct cmd_results *cmd_workspace_layout(int argc, char **argv) { | |||
| 21 | if ((error = checkarg(argc, "workspace_layout auto", EXPECTED_EQUAL_TO, 2))) { | 21 | if ((error = checkarg(argc, "workspace_layout auto", EXPECTED_EQUAL_TO, 2))) { |
| 22 | return error; | 22 | return error; |
| 23 | } | 23 | } |
| 24 | if (strcasecmp(argv[0], "left") == 0) { | 24 | if (strcasecmp(argv[1], "left") == 0) { |
| 25 | config->default_layout = L_AUTO_LEFT; | 25 | config->default_layout = L_AUTO_LEFT; |
| 26 | } else if (strcasecmp(argv[0], "right") == 0) { | 26 | } else if (strcasecmp(argv[1], "right") == 0) { |
| 27 | config->default_layout = L_AUTO_RIGHT; | 27 | config->default_layout = L_AUTO_RIGHT; |
| 28 | } else if (strcasecmp(argv[0], "top") == 0) { | 28 | } else if (strcasecmp(argv[1], "top") == 0) { |
| 29 | config->default_layout = L_AUTO_TOP; | 29 | config->default_layout = L_AUTO_TOP; |
| 30 | } else if (strcasecmp(argv[0], "bottom") == 0) { | 30 | } else if (strcasecmp(argv[1], "bottom") == 0) { |
| 31 | config->default_layout = L_AUTO_BOTTOM; | 31 | config->default_layout = L_AUTO_BOTTOM; |
| 32 | } else { | 32 | } else { |
| 33 | return cmd_results_new(CMD_INVALID, "workspace_layout auto", "Expected 'workspace_layout auto <left|right|top|bottom>'"); | 33 | return cmd_results_new(CMD_INVALID, "workspace_layout auto", "Expected 'workspace_layout auto <left|right|top|bottom>'"); |