From 59a581a39eb9051d3274d41bbdb12eb35b04ed5d Mon Sep 17 00:00:00 2001
From: patrick96 <p.ziegler96@gmail.com>
Date: Mon, 21 Feb 2022 19:57:25 +0100
Subject: [PATCH] Emit error when workspace mapping has invalid format

Closes #2024
---
 src/modules/bspwm.cpp       | 5 +++++
 src/modules/i3.cpp          | 5 +++++
 src/modules/xworkspaces.cpp | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/src/modules/bspwm.cpp b/src/modules/bspwm.cpp
index 90af2760..d3d6e889 100644
--- a/src/modules/bspwm.cpp
+++ b/src/modules/bspwm.cpp
@@ -134,11 +134,16 @@ namespace modules {
     m_icons = std::make_shared<iconset>();
     m_icons->add(DEFAULT_ICON, std::make_shared<label>(m_conf.get(name(), DEFAULT_ICON, ""s)));
 
+    int i = 0;
     for (const auto& workspace : m_conf.get_list<string>(name(), "ws-icon", {})) {
       auto vec = string_util::tokenize(workspace, ';');
       if (vec.size() == 2) {
         m_icons->add(vec[0], std::make_shared<label>(vec[1]));
+      } else {
+        m_log.err("%s: Ignoring ws-icon-%d because it has %s semicolons", name(), i, vec.size() > 2? "too many" : "too few");
       }
+
+      i++;
     }
   }
 
diff --git a/src/modules/i3.cpp b/src/modules/i3.cpp
index 94aee0eb..d2bc0e86 100644
--- a/src/modules/i3.cpp
+++ b/src/modules/i3.cpp
@@ -61,11 +61,16 @@ namespace modules {
     m_icons = std::make_shared<iconset>();
     m_icons->add(DEFAULT_WS_ICON, std::make_shared<label>(m_conf.get(name(), DEFAULT_WS_ICON, ""s)));
 
+    int i = 0;
     for (const auto& workspace : m_conf.get_list<string>(name(), "ws-icon", {})) {
       auto vec = string_util::tokenize(workspace, ';');
       if (vec.size() == 2) {
         m_icons->add(vec[0], std::make_shared<label>(vec[1]));
+      } else {
+        m_log.err("%s: Ignoring ws-icon-%d because it has %s semicolons", name(), i, vec.size() > 2? "too many" : "too few");
       }
+
+      i++;
     }
 
     try {
diff --git a/src/modules/xworkspaces.cpp b/src/modules/xworkspaces.cpp
index 020e645b..57060e73 100644
--- a/src/modules/xworkspaces.cpp
+++ b/src/modules/xworkspaces.cpp
@@ -73,11 +73,16 @@ namespace modules {
     m_icons = std::make_shared<iconset>();
     m_icons->add(DEFAULT_ICON, std::make_shared<label>(m_conf.get(name(), DEFAULT_ICON, ""s)));
 
+    int i = 0;
     for (const auto& workspace : m_conf.get_list<string>(name(), "icon", {})) {
       auto vec = string_util::tokenize(workspace, ';');
       if (vec.size() == 2) {
         m_icons->add(vec[0], std::make_shared<label>(vec[1]));
+      } else {
+        m_log.err("%s: Ignoring icon-%d because it has %s semicolons", name(), i, vec.size() > 2? "too many" : "too few");
       }
+
+      i++;
     }
 
     // Get list of monitors