Merge pull request #2613 from apreiml/fix_no_last_focus_fail

handle_layer_shell_surface: Do not crash if seat doesn't have focus
master
emersion 6 years ago committed by GitHub
commit 024b9d85ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -337,8 +337,11 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
struct sway_seat *seat = input_manager_get_default_seat(input_manager); struct sway_seat *seat = input_manager_get_default_seat(input_manager);
if (seat) { if (seat) {
struct sway_workspace *ws = seat_get_focused_workspace(seat); struct sway_workspace *ws = seat_get_focused_workspace(seat);
if (ws != NULL) {
output = ws->output; output = ws->output;
} }
}
if (!output) { if (!output) {
if (!sway_assert(root->outputs->length, if (!sway_assert(root->outputs->length,
"cannot auto-assign output for layer")) { "cannot auto-assign output for layer")) {

Loading…
Cancel
Save