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

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