mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-16 13:13:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2828 from RyanDwyer/fix-locked-map-crash

Browse source 
Fix crash when view maps while locked
This commit is contained in:
emersion 2018-10-13 13:22:35 +02:00 committed by GitHub
parent b80cf982ae 9190735947
commit 782a835175
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sway/tree/arrange.c
View file

@ -180,6 +180,10 @@ void arrange_workspace(struct sway_workspace *workspace) {
if (config->reloading) { if (config->reloading) {
return; return;
} }
if (!workspace->output) {
// Happens when there are no outputs connected
return;
}
struct sway_output *output = workspace->output; struct sway_output *output = workspace->output;
struct wlr_box *area = &output->usable_area; struct wlr_box *area = &output->usable_area;
wlr_log(WLR_DEBUG, "Usable area for ws: %dx%d@%d,%d", wlr_log(WLR_DEBUG, "Usable area for ws: %dx%d@%d,%d",

11
sway/tree/view.c
View file

@ -504,7 +504,16 @@ static struct sway_workspace *select_workspace(struct sway_view *view) {
} }
// Use the focused workspace // Use the focused workspace
return seat_get_focused_workspace(seat); struct sway_node *node = seat_get_focus_inactive(seat, &root->node);
if (node && node->type == N_WORKSPACE) {
return node->sway_workspace;
} else if (node && node->type == N_CONTAINER) {
return node->sway_container->workspace;
}
// If there's no focus_inactive workspace then we must be running without
// any outputs connected
return root->saved_workspaces->items[0];
} }
static bool should_focus(struct sway_view *view) { static bool should_focus(struct sway_view *view) {