diff options
| author |  emersion <contact@emersion.fr> | 2019-03-10 21:47:30 +0100 |
|---|---|---|
| committer |  Drew DeVault <sir@cmpwn.com> | 2019-03-10 14:59:34 -0600 |
| commit | 191305468c0fe9b1acf8b6ad6c8a49b97cf793aa (patch) | |
| tree | e9ae2fe1c00bba124507a3f0e4385b5fa5e6533b /sway/input/seat.c | |
| parent | Update language in sway.desktop & sway(1) (diff) | |
| download | sway-191305468c0fe9b1acf8b6ad6c8a49b97cf793aa.tar.gz sway-191305468c0fe9b1acf8b6ad6c8a49b97cf793aa.tar.zst sway-191305468c0fe9b1acf8b6ad6c8a49b97cf793aa.zip | |
Fix crash in cmd_workspace when layer surface has focus
Diffstat (limited to 'sway/input/seat.c')
| -rw-r--r-- | sway/input/seat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c index 245326a1..3a68904b 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c | |||
| @@ -1101,7 +1101,7 @@ struct sway_node *seat_get_focus(struct sway_seat *seat) { | |||
| 1101 | } | 1101 | } |
| 1102 | 1102 | ||
| 1103 | struct sway_workspace *seat_get_focused_workspace(struct sway_seat *seat) { | 1103 | struct sway_workspace *seat_get_focused_workspace(struct sway_seat *seat) { |
| 1104 | struct sway_node *focus = seat_get_focus(seat); | 1104 | struct sway_node *focus = seat_get_focus_inactive(seat, &root->node); |
| 1105 | if (!focus) { | 1105 | if (!focus) { |
| 1106 | return NULL; | 1106 | return NULL; |
| 1107 | } | 1107 | } |
| @@ -1111,7 +1111,7 @@ struct sway_workspace *seat_get_focused_workspace(struct sway_seat *seat) { | |||
| 1111 | if (focus->type == N_WORKSPACE) { | 1111 | if (focus->type == N_WORKSPACE) { |
| 1112 | return focus->sway_workspace; | 1112 | return focus->sway_workspace; |
| 1113 | } | 1113 | } |
| 1114 | return NULL; // unreachable | 1114 | return NULL; // output doesn't have a workspace yet |
| 1115 | } | 1115 | } |
| 1116 | 1116 | ||
| 1117 | struct sway_container *seat_get_focused_container(struct sway_seat *seat) { | 1117 | struct sway_container *seat_get_focused_container(struct sway_seat *seat) { |