aboutsummaryrefslogtreecommitdiff
path: root/xwayland
diff options
context:
space:
mode:
Diffstat (limited to 'xwayland')
-rw-r--r--xwayland/server.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/xwayland/server.c b/xwayland/server.c
index 6a0c9fc3..f5c6b060 100644
--- a/xwayland/server.c
+++ b/xwayland/server.c
@@ -16,6 +16,7 @@
#include <wlr/xwayland.h>
#include "sockets.h"
#include "util/signal.h"
+#include "xwayland/config.h"
static void safe_close(int fd) {
if (fd >= 0) {
@@ -442,6 +443,11 @@ void wlr_xwayland_server_destroy(struct wlr_xwayland_server *server) {
struct wlr_xwayland_server *wlr_xwayland_server_create(
struct wl_display *wl_display,
struct wlr_xwayland_server_options *options) {
+ if (!getenv("WLR_XWAYLAND") && access(XWAYLAND_PATH, X_OK) != 0) {
+ wlr_log(WLR_ERROR, "Cannot find Xwayland binary \"%s\"", XWAYLAND_PATH);
+ return NULL;
+ }
+
struct wlr_xwayland_server *server =
calloc(1, sizeof(struct wlr_xwayland_server));
if (!server) {