Merge pull request #2465 from DonnieWest/master

Default to the previous workspace if the current one has no focused windows
This commit is contained in:
Ryan Dwyer 2018-08-17 10:04:03 +10:00 committed by GitHub
commit 32193c7e4d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -258,7 +258,8 @@ struct sway_container *workspace_by_name(const char *name) {
struct sway_container *current_workspace = NULL, *current_output = NULL;
struct sway_container *focus = seat_get_focus(seat);
if (focus) {
current_workspace = container_parent(focus, C_WORKSPACE);
current_workspace = focus->type == C_WORKSPACE ?
focus : container_parent(focus, C_WORKSPACE);
current_output = container_parent(focus, C_OUTPUT);
}