From df94b62685f640c4e1854eec5736e01f812a2d66 Mon Sep 17 00:00:00 2001 From: monsta Date: Tue, 15 Dec 2015 16:48:47 +0300 Subject: don't crash when XRRGetScreenResourcesCurrent fails --- src/gpm-brightness.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/gpm-brightness.c b/src/gpm-brightness.c index 8600474..686f676 100644 --- a/src/gpm-brightness.c +++ b/src/gpm-brightness.c @@ -846,7 +846,12 @@ gpm_brightness_update_cache (GpmBrightness *brightness) } root = RootWindow (brightness->priv->dpy, screen); + + gdk_error_trap_push (); resource = XRRGetScreenResourcesCurrent (brightness->priv->dpy, root); + if (gdk_error_trap_pop () || resource == NULL) { + egg_warning ("failed to XRRGetScreenResourcesCurrent"); + } if (resource != NULL) { egg_debug ("adding resource %p", resource); -- cgit v1.2.1