mirror of
https://github.com/swaywm/sway.git
synced 2024-11-28 02:41:28 +00:00
Merge branch 'master' into feature/swap-workspace
This commit is contained in:
commit
bfd2d7e125
|
@ -1,7 +1,7 @@
|
|||
project(
|
||||
'sway',
|
||||
'c',
|
||||
version: '1.9-dev',
|
||||
version: '1.10-dev',
|
||||
license: 'MIT',
|
||||
meson_version: '>=0.60.0',
|
||||
default_options: [
|
||||
|
|
|
@ -172,7 +172,7 @@ bool server_init(struct sway_server *server) {
|
|||
|
||||
root = root_create(server->wl_display);
|
||||
|
||||
server->backend = wlr_backend_autocreate(server->wl_display, &server->session);
|
||||
server->backend = wlr_backend_autocreate(server->wl_event_loop, &server->session);
|
||||
if (!server->backend) {
|
||||
sway_log(SWAY_ERROR, "Unable to create backend");
|
||||
return false;
|
||||
|
@ -355,7 +355,7 @@ bool server_init(struct sway_server *server) {
|
|||
return false;
|
||||
}
|
||||
|
||||
server->headless_backend = wlr_headless_backend_create(server->wl_display);
|
||||
server->headless_backend = wlr_headless_backend_create(server->wl_event_loop);
|
||||
if (!server->headless_backend) {
|
||||
sway_log(SWAY_ERROR, "Failed to create secondary headless backend");
|
||||
wlr_backend_destroy(server->backend);
|
||||
|
|
Loading…
Reference in a new issue