nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/config.c
View file

@ -155,9 +155,7 @@ int get_task_status(char* status)
int config_get_monitor(char* monitor)
{
if (strcmp(monitor, "all") == 0)
return -1;
else {
if (strcmp(monitor, "all") != 0) {
char* endptr;
int ret_int = strtol(monitor, &endptr, 10);
if (*endptr == 0)
@ -166,6 +164,9 @@ int config_get_monitor(char* monitor)
// monitor specified by name, not by index
int i, j;
for (i=0; i<server.nb_monitor; ++i) {
if (server.monitor[i].names == 0)
// xrandr can't identify monitors
continue;
j = 0;
while (server.monitor[i].names[j] != 0) {
if (strcmp(monitor, server.monitor[i].names[j++]) == 0)
@ -174,6 +175,7 @@ int config_get_monitor(char* monitor)
}
}
}
// monitor == "all" or monitor not found or xrandr can't identify monitors
return -1;
}

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