X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fconfig.c;h=6233eccc36d8f48d33b903b856265edc01066d2a;hb=106a3423e2a034da08b6f12c87b42b9a99fb34af;hp=61178d11918237301720c7f0843579103923f80f;hpb=fed047d774c4523775beec25466aadd25fc2e7a4;p=chaz%2Ftint2

diff --git a/src/config.c b/src/config.c
index 61178d1..6233ecc 100644
--- a/src/config.c
+++ b/src/config.c
@@ -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;
 }