Merge remote-tracking branch 'upstream/master' into fix-freebsd-build

1 files changed, 3 insertions, 3 deletions

diff --git a/sway/commands/border.c b/sway/commands/border.c
index 9c19e20a..9502c877 100644
--- a/sway/commands/border.c
+++ b/sway/commands/border.c
@@ -27,9 +27,6 @@ struct cmd_results *cmd_border(int argc, char **argv) {
 		view->border = B_NORMAL;
 	} else if (strcmp(argv[0], "pixel") == 0) {
 		view->border = B_PIXEL;
-		if (argc == 2) {
-			view->border_thickness = atoi(argv[1]);
-		}
 	} else if (strcmp(argv[0], "toggle") == 0) {
 		view->border = (view->border + 1) % 3;
 	} else {
@@ -37,6 +34,9 @@ struct cmd_results *cmd_border(int argc, char **argv) {
 				"Expected 'border <none|normal|pixel|toggle>' "
 				"or 'border pixel <px>'");
 	}
+	if (argc == 2) {
+		view->border_thickness = atoi(argv[1]);
+	}
 
 	if (container_is_floating(view->swayc)) {
 		container_set_geometry_from_floating_view(view->swayc);