fixed segfault with monitor detection

[chaz/tint2] / src / server.c

diff --git a/src/server.c b/src/server.c
index d30b10906ffbb119dc28054ab02e233af8dfd7e5..db50445133a71426af8039df174c7121ba0bc747 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -253,7 +253,7 @@ void get_monitors()
                XineramaScreenInfo *info = XineramaQueryScreens(server.dsp, &nbmonitor);
                XRRScreenResources *res = XRRGetScreenResourcesCurrent(server.dsp, server.root_win);
 
-               if (res->ncrtc >= nbmonitor) {
+               if (res && res->ncrtc >= nbmonitor) {
                        // use xrandr to identify monitors (does not work with proprietery nvidia drivers)
                        printf("xRandr: Found crtc's: %d\n", res->ncrtc );
                        server.monitor = malloc(res->ncrtc * sizeof(Monitor));
@@ -307,7 +307,8 @@ next:
                server.monitor = realloc(server.monitor, server.nb_monitor * sizeof(Monitor));
                qsort(server.monitor, server.nb_monitor, sizeof(Monitor), compareMonitorPos);
 
-               XRRFreeScreenResources(res);
+               if (res)
+                       XRRFreeScreenResources(res);
                XFree(info);
        }