From d8097c44dda6205052c5213f4b69d05fc95f1589 Mon Sep 17 00:00:00 2001 From: Jari Vetoniemi Date: Mon, 9 Mar 2015 09:53:57 +0200 Subject: Make renderers try detect whether they are in correct env. --- lib/renderers/wayland/wayland.c | 3 +++ lib/renderers/x11/x11.c | 3 +++ 2 files changed, 6 insertions(+) (limited to 'lib/renderers') diff --git a/lib/renderers/wayland/wayland.c b/lib/renderers/wayland/wayland.c index c348c7a..12fd257 100644 --- a/lib/renderers/wayland/wayland.c +++ b/lib/renderers/wayland/wayland.c @@ -184,6 +184,9 @@ destructor(struct bm_menu *menu) static bool constructor(struct bm_menu *menu) { + if (!getenv("WAYLAND_DISPLAY") && !getenv("WAYLAND_SOCKET")) + return false; + struct wayland *wayland; if (!(menu->renderer->internal = wayland = calloc(1, sizeof(struct wayland)))) goto fail; diff --git a/lib/renderers/x11/x11.c b/lib/renderers/x11/x11.c index 3e991c9..79adad8 100644 --- a/lib/renderers/x11/x11.c +++ b/lib/renderers/x11/x11.c @@ -200,6 +200,9 @@ destructor(struct bm_menu *menu) static bool constructor(struct bm_menu *menu) { + if (getenv("WAYLAND_DISPLAY") || getenv("WAYLAND_SOCKET")) + return false; + struct x11 *x11; if (!(menu->renderer->internal = x11 = calloc(1, sizeof(struct x11)))) goto fail; -- cgit v1.2.3-70-g09d2