X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fconfig.c;h=1175660b4d45e74c13717a2f90ca50c825cdf1d8;hb=4397d05345ef018884ebb8f52bf5332c086c570e;hp=4ea8d84376001b0385c1796a3469489182313cd5;hpb=e050df33d29de6f7890b7111f6ea871aa5247743;p=chaz%2Ftint2

diff --git a/src/config.c b/src/config.c
index 4ea8d84..1175660 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;
 }
 
@@ -281,10 +283,10 @@ void add_entry (char *key, char *value)
 	else if (strcmp (key, "panel_layer") == 0) {
 		if (strcmp(value, "bottom") == 0)
 			panel_layer = BOTTOM_LAYER;
-		else if (strcmp(value, "normal") == 0)
-			panel_layer = NORMAL_LAYER;
 		else if (strcmp(value, "top") == 0)
 			panel_layer = TOP_LAYER;
+		else
+			panel_layer = NORMAL_LAYER;
 	}
 
 	/* Battery */
@@ -590,8 +592,13 @@ void add_entry (char *key, char *value)
 		else
 			panel_strut_policy = STRUT_MINIMUM;
 	}
-	else if (strcmp(key, "autohide_height") == 0)
+	else if (strcmp(key, "autohide_height") == 0) {
 		panel_autohide_height = atoi(value);
+		if (panel_autohide_height == 0) {
+			// autohide need height > 0
+			panel_autohide_height = 1;
+		}
+	}
 
 	else
 		fprintf(stderr, "tint2 : invalid option \"%s\",\n  upgrade tint2 or correct your config file\n", key);