aboutsummaryrefslogtreecommitdiff
path: root/sway/commands
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2019-03-10 21:47:30 +0100
committerDrew DeVault <sir@cmpwn.com>2019-03-10 14:59:34 -0600
commit191305468c0fe9b1acf8b6ad6c8a49b97cf793aa (patch)
treee9ae2fe1c00bba124507a3f0e4385b5fa5e6533b /sway/commands
parent83b68b21541ac00649c9d100cfec198326152fec (diff)
downloadsway-191305468c0fe9b1acf8b6ad6c8a49b97cf793aa.tar.xz
Fix crash in cmd_workspace when layer surface has focus
Diffstat (limited to 'sway/commands')
-rw-r--r--sway/commands/workspace.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sway/commands/workspace.c b/sway/commands/workspace.c
index 5fde8129..362dcd1b 100644
--- a/sway/commands/workspace.c
+++ b/sway/commands/workspace.c
@@ -184,6 +184,11 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
bool create = argc > 1 && strcasecmp(argv[1], "--create") == 0;
struct sway_seat *seat = config->handler_context.seat;
struct sway_workspace *current = seat_get_focused_workspace(seat);
+ if (!current) {
+ return cmd_results_new(CMD_FAILURE, "workspace",
+ "No workspace to switch from");
+ }
+
struct sway_workspace *ws = NULL;
if (strcasecmp(argv[0], "number") == 0) {
if (argc < 2) {