mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix crash in cmd_workspace when layer surface has focus

This commit is contained in:
emersion 2019-03-10 21:47:30 +01:00 committed by Drew DeVault
parent e3dd074a31
commit 0717b76715
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sway/commands/workspace.c
View File

@ -181,7 +181,6 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
++argv;
}
struct sway_workspace *ws = NULL;
if (strcasecmp(argv[0], "number") == 0) {
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_node *focus = seat_get_focus(seat);
struct sway_node *focus = seat_get_focus_inactive(seat, &root->node);
if (!focus) {
return NULL;
}
@ -1111,7 +1111,7 @@ struct sway_workspace *seat_get_focused_workspace(struct sway_seat *seat) {
if (focus->type == N_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) {