sway

commit 37eb83940f1c5630dbafc8990d1340d55dd3f411
parent 6b59533646ea50e843f594ba041109873e0db16b
Author: Drew DeVault <sir@cmpwn.com>
Date:   Thu, 25 Oct 2018 20:10:41 +0200

Merge pull request #2980 from ppascher/allow_workspace_missing_output

Update workspace.c
Diffstat:
M
sway/commands/workspace.c
 | 
7
+++----

1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/sway/commands/workspace.c b/sway/commands/workspace.c
@@ -38,10 +38,6 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
 	if ((error = checkarg(argc, "workspace", EXPECTED_AT_LEAST, 1))) {
 		return error;
 	}
-	if (!root->outputs->length) {
-		return cmd_results_new(CMD_INVALID, "workspace",
-				"Can't run this command while there's no outputs connected.");
-	}
 
 	int output_location = -1;
 	int gaps_location = -1;
@@ -112,6 +108,9 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
 	} else {
 		if (config->reading || !config->active) {
 			return cmd_results_new(CMD_DEFER, "workspace", NULL);
+		} else if (!root->outputs->length) {
+			return cmd_results_new(CMD_INVALID, "workspace",
+					"Can't run this command while there's no outputs connected.");
 		}
 
 		bool no_auto_back_and_forth = false;