[cogl/cogl-1.16] xlib: Don't crash just because the display doesn't expose RANDR



commit c08fe74cd0dd363e68b8019cad1f2954817ca4a3
Author: Adam Jackson <ajax redhat com>
Date:   Wed May 1 19:26:06 2013 -0400

    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 <ajax redhat com>
    Reviewed-by: Robert Bragg <robert linux intel com>
    
    (cherry picked from commit 57a79912ac70080a2f9cbe65181a25b00bf1192a)

 cogl/cogl-xlib-renderer.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/cogl/cogl-xlib-renderer.c b/cogl/cogl-xlib-renderer.c
index 92f044d..3aa70f2 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;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]