From bb88038c1720f07f5fdcce62995dacf7fa33819f Mon Sep 17 00:00:00 2001
From: Vesim <vesim809@pm.me>
Date: Thu, 27 Feb 2020 21:49:09 +0100
Subject: [PATCH] Dont exclude outputs in arrays

---
 src/client.cpp | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/client.cpp b/src/client.cpp
index d7f4e94c..ead23fb3 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -64,28 +64,22 @@ void waybar::Client::handleOutput(struct waybar_output &output) {
 }
 
 bool waybar::Client::isValidOutput(const Json::Value &config, struct waybar_output &output) {
+  if (config["output"].isArray()) {
+    for (auto const &output_conf : config["output"]) {
+      if (output_conf.isString() && output_conf.asString() == output.name) {
+        return true;
+      }
+    }
+  }
 
-  auto check_output = [](std::string_view config_output_name, struct waybar_output &output) {
+  if (config["output"].isString()) {
+    auto config_output_name = config["output"].asString();
     if (!config_output_name.empty()) {
       if (config_output_name.substr(0, 1) == "!") {
           return config_output_name.substr(1) != output.name;
       }
       return config_output_name == output.name;
     }
-    return false;
-  };
-
-  if (config["output"].isArray()) {
-    for (auto const &output_conf : config["output"]) {
-      if (output_conf.isString() && check_output(output_conf.asString(), output)) {
-        if(check_output(output_conf.asString(), output)) {
-          return true;
-        }
-      }
-    }
-  }
-  if (config["output"].isString()) {
-    return check_output(config["output"].asString(), output);
   }
 
   return false;