diff options
author | Ryan Dwyer <[email protected]> | 2018-10-13 19:15:04 +1000 |
---|---|---|
committer | Ryan Dwyer <[email protected]> | 2018-10-13 19:15:04 +1000 |
commit | 9190735947947f5afa21f725cfe0569abde946aa (patch) | |
tree | 1b206c8e09ff9e084f92981e8d01b2aab8a5e42e /sway/tree/view.c | |
parent | b80cf982ae5151775a11a2b579eae41ffa9d3e14 (diff) |
Fix crash when view maps while locked
When locked, there is no active workspace so it must find the
focus_inactive workspace instead.
Additionally, this adds a check for if a view maps while there are no
outputs connected and handles it gracefully.
Diffstat (limited to 'sway/tree/view.c')
-rw-r--r-- | sway/tree/view.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sway/tree/view.c b/sway/tree/view.c index e613ac0b..1104af36 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -504,7 +504,16 @@ static struct sway_workspace *select_workspace(struct sway_view *view) { } // Use the focused workspace - return seat_get_focused_workspace(seat); + struct sway_node *node = seat_get_focus_inactive(seat, &root->node); + if (node && node->type == N_WORKSPACE) { + return node->sway_workspace; + } else if (node && node->type == N_CONTAINER) { + return node->sway_container->workspace; + } + + // If there's no focus_inactive workspace then we must be running without + // any outputs connected + return root->saved_workspaces->items[0]; } static bool should_focus(struct sway_view *view) { |