Merge pull request #428 from emersion/fix-disabled-xwayland

Fix segfault when xwayland is disabled
This commit is contained in:
Drew DeVault 2017-11-17 09:31:31 -05:00 committed by GitHub
commit bf5640db12
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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);