summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-01-07 01:06:28 +0100
committerwm4 <wm4@nowhere>2014-01-07 01:07:52 +0100
commit2c4c912c15379ca26c976d2fdb27ff28ce546910 (patch)
tree5c6ce4d4b8e2011c78cb6d27036051dcbcea2fd7 /video
parent326d887a41dd2eefdc8496e218ada1a0d0379a70 (diff)
downloadmpv-2c4c912c15379ca26c976d2fdb27ff28ce546910.tar.bz2
mpv-2c4c912c15379ca26c976d2fdb27ff28ce546910.tar.xz
wayland: silence annoying libwayland-client message
libwayland-client contains the following code [1]: runtime_dir = getenv("XDG_RUNTIME_DIR"); if (!runtime_dir) { fprintf(stderr, "error: XDG_RUNTIME_DIR not set in the environment.\n"); This means this message will unconditionally and unavoidably be printed if XDG_RUNTIME_DIR is not set. Since mpv is a terminal program, and we want to avoid unnecessary output, work it around by not attempting to use wayland if this environment variable is not set. [1] http://cgit.freedesktop.org/wayland/wayland/tree/src/wayland-client.c#n636 (cd0dccd01e16fa404e03974d30ded3aebdb1c4bc)
Diffstat (limited to 'video')
-rw-r--r--video/out/wayland_common.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c
index 00c136bdb2..67ec2cb4c1 100644
--- a/video/out/wayland_common.c
+++ b/video/out/wayland_common.c
@@ -736,6 +736,9 @@ static void shedule_resize(struct vo_wayland_state *wl,
static bool create_display (struct vo_wayland_state *wl)
{
+ if (wl->vo->probing && !getenv("XDG_RUNTIME_DIR"))
+ return false;
+
wl->display.display = wl_display_connect(NULL);
if (!wl->display.display) {