From c08fe74cd0dd363e68b8019cad1f2954817ca4a3 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 1 May 2013 19:26:06 -0400 Subject: [PATCH] xlib: Don't crash just because the display doesn't expose RANDR If this happens, XRRGetScreenResources will return NULL, so just treat that like nothing happened. https://bugzilla.gnome.org/show_bug.cgi?id=699431 Signed-off-by: Adam Jackson Reviewed-by: Robert Bragg (cherry picked from commit 57a79912ac70080a2f9cbe65181a25b00bf1192a) --- cogl/cogl-xlib-renderer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cogl/cogl-xlib-renderer.c b/cogl/cogl-xlib-renderer.c index 92f044daf..3aa70f20b 100644 --- a/cogl/cogl-xlib-renderer.c +++ b/cogl/cogl-xlib-renderer.c @@ -239,7 +239,7 @@ update_outputs (CoglRenderer *renderer, _cogl_xlib_renderer_trap_errors (renderer, &state); - for (i = 0; i < resources->ncrtc && !error; i++) + for (i = 0; resources && i < resources->ncrtc && !error; i++) { XRRCrtcInfo *crtc_info = NULL; XRROutputInfo *output_info = NULL;