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

Fix segfault when xwayland is disabled
7 years ago · bf5640db12
parent 10f3be7384 632759a499
commit bf5640db12
1 changed files with 6 additions and 2 deletions
--- a/rootston/main.c
+++ b/rootston/main.c
@ -58,8 +58,12 @@ int main(int argc, char **argv) {
 #ifndef HAS_XWAYLAND
 	ready(NULL, NULL);
 #else
-	struct wl_listener xwayland_ready = { .notify = ready };
-	wl_signal_add(&server.desktop->xwayland->events.ready, &xwayland_ready);
+	if (server.desktop->xwayland != NULL) {
+		struct wl_listener xwayland_ready = { .notify = ready };
+		wl_signal_add(&server.desktop->xwayland->events.ready, &xwayland_ready);
+	} else {
+		ready(NULL, NULL);
+	}
 #endif

 	wl_display_run(server.wl_display);