From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 4 Feb 2013 20:36:55 +0000 (+0100)
Subject: Bugfix: output auto detect: properly detect ambiguous situations (Thanks mist)
X-Git-Tag: 2.7~11
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=68e447d3f6bb7767e4d95458b13ead49d76e5410;p=i3%2Fi3status

Bugfix: output auto detect: properly detect ambiguous situations (Thanks mist)

fixes #940
---

diff --git a/src/auto_detect_format.c b/src/auto_detect_format.c
index 46e5f95..6ec5f73 100644
--- a/src/auto_detect_format.c
+++ b/src/auto_detect_format.c
@@ -139,7 +139,7 @@ char *auto_detect_format(void) {
         else if (strcasecmp(name, "xmobar") == 0)
             newfmt = "xmobar";
 
-        if (newfmt && format) {
+        if (newfmt && format && strcmp(newfmt, format) != 0) {
             fprintf(stderr, "i3status: cannot auto-configure, situation ambiguous (format \"%s\" *and* \"%s\" detected)\n", newfmt, format);
             format = NULL;
             break;