mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-03 09:01:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix crash in cmd_workspace when layer surface has focus

Browse source
This commit is contained in:
emersion 2019-03-10 21:47:30 +01:00 • committed by Drew DeVault
parent 83b68b2154
commit 191305468c
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sway/commands/workspace.c
View file

@ -184,6 +184,11 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
bool create = argc > 1 && strcasecmp(argv[1], "--create") == 0; bool create = argc > 1 && strcasecmp(argv[1], "--create") == 0;
struct sway_seat *seat = config->handler_context.seat; struct sway_seat *seat = config->handler_context.seat;
struct sway_workspace *current = seat_get_focused_workspace(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; struct sway_workspace *ws = NULL;
if (strcasecmp(argv[0], "number") == 0) { if (strcasecmp(argv[0], "number") == 0) {
if (argc < 2) { if (argc < 2) {

4
sway/input/seat.c
View file

@ -1101,7 +1101,7 @@ struct sway_node *seat_get_focus(struct sway_seat *seat) {
} }
struct sway_workspace *seat_get_focused_workspace(struct sway_seat *seat) { struct sway_workspace *seat_get_focused_workspace(struct sway_seat *seat) {
struct sway_node *focus = seat_get_focus(seat); struct sway_node *focus = seat_get_focus_inactive(seat, &root->node);
if (!focus) { if (!focus) {
return NULL; return NULL;
} }
@ -1111,7 +1111,7 @@ struct sway_workspace *seat_get_focused_workspace(struct sway_seat *seat) {
if (focus->type == N_WORKSPACE) { if (focus->type == N_WORKSPACE) {
return focus->sway_workspace; return focus->sway_workspace;
} }
return NULL; // unreachable return NULL; // output doesn't have a workspace yet
} }
struct sway_container *seat_get_focused_container(struct sway_seat *seat) { struct sway_container *seat_get_focused_container(struct sway_seat *seat) {