mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-11-02 11:55:59 +01:00
Merge pull request #428 from emersion/fix-disabled-xwayland
Fix segfault when xwayland is disabled
This commit is contained in:
commit
bf5640db12
1 changed files with 6 additions and 2 deletions
|
@ -58,8 +58,12 @@ int main(int argc, char **argv) {
|
||||||
#ifndef HAS_XWAYLAND
|
#ifndef HAS_XWAYLAND
|
||||||
ready(NULL, NULL);
|
ready(NULL, NULL);
|
||||||
#else
|
#else
|
||||||
|
if (server.desktop->xwayland != NULL) {
|
||||||
struct wl_listener xwayland_ready = { .notify = ready };
|
struct wl_listener xwayland_ready = { .notify = ready };
|
||||||
wl_signal_add(&server.desktop->xwayland->events.ready, &xwayland_ready);
|
wl_signal_add(&server.desktop->xwayland->events.ready, &xwayland_ready);
|
||||||
|
} else {
|
||||||
|
ready(NULL, NULL);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
wl_display_run(server.wl_display);
|
wl_display_run(server.wl_display);
|
||||||
|
|
Loading…
Reference in a new issue