Merge pull request #3743 from RedSoxFan/fix-output-get-active-workspace

output_get_active_workspace: check workspaces length
This commit is contained in:
Drew DeVault 2019-02-21 09:14:19 -05:00 committed by GitHub
commit 79c133182d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -320,6 +320,9 @@ struct sway_workspace *output_get_active_workspace(struct sway_output *output) {
struct sway_seat *seat = input_manager_current_seat(); struct sway_seat *seat = input_manager_current_seat();
struct sway_node *focus = seat_get_active_tiling_child(seat, &output->node); struct sway_node *focus = seat_get_active_tiling_child(seat, &output->node);
if (!focus) { if (!focus) {
if (!output->workspaces->length) {
return NULL;
}
return output->workspaces->items[0]; return output->workspaces->items[0];
} }
return focus->sway_workspace; return focus->sway_workspace;