diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2018-03-30 18:49:18 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-03-30 18:49:18 -0400 |
| commit | e6fa7a722e9329b1e61ff2977ae715da3c2d9c9b (patch) | |
| tree | 65e272dbd50614ff343d1297aee99cb46a497d1a /sway/ipc-server.c | |
| parent | Set exclusive zone to -1 for swaybg (diff) | |
| parent | Fix segfaults when focusing a workspace (diff) | |
| download | sway-e6fa7a722e9329b1e61ff2977ae715da3c2d9c9b.tar.gz sway-e6fa7a722e9329b1e61ff2977ae715da3c2d9c9b.tar.zst sway-e6fa7a722e9329b1e61ff2977ae715da3c2d9c9b.zip | |
Merge pull request #1669 from emersion/workspace-pointer-events
Fix pointer events for hidden workspaces
Diffstat (limited to 'sway/ipc-server.c')
| -rw-r--r-- | sway/ipc-server.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/ipc-server.c b/sway/ipc-server.c index f1854bcc..869f1ed0 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c | |||
| @@ -390,7 +390,7 @@ static void ipc_get_workspaces_callback(struct sway_container *workspace, | |||
| 390 | struct sway_seat *seat = | 390 | struct sway_seat *seat = |
| 391 | sway_input_manager_get_default_seat(input_manager); | 391 | sway_input_manager_get_default_seat(input_manager); |
| 392 | struct sway_container *focused_ws = sway_seat_get_focus(seat); | 392 | struct sway_container *focused_ws = sway_seat_get_focus(seat); |
| 393 | if (focused_ws->type != C_WORKSPACE) { | 393 | if (focused_ws != NULL && focused_ws->type != C_WORKSPACE) { |
| 394 | focused_ws = container_parent(focused_ws, C_WORKSPACE); | 394 | focused_ws = container_parent(focused_ws, C_WORKSPACE); |
| 395 | } | 395 | } |
| 396 | bool focused = workspace == focused_ws; | 396 | bool focused = workspace == focused_ws; |