Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed segfault with monitor detection

Browse Source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@469 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
thilor77
2010-06-08 15:56:04 +00:00
parent 299faa4821
commit 87f02c57e6
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/server.c
View File

@@ -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);
}