From 3854fc91b53946c204aac79359888bcb3653778a Mon Sep 17 00:00:00 2001 From: patrick96 Date: Tue, 7 Jan 2020 13:40:24 +0100 Subject: [PATCH] fix(xworkspaces): Show _NET_NUMBER_OF_DESKTOPS desktops In the case where _NET_NUMBER_OF_DESKTOPS > |_NET_DESKTOP_NAMES| the last branch of the get_desktop_names method would return a vector with _NET_NUMBER_OF_DESKTOPS + 1 elements because we iterate until _NET_NUMBER_OF_DESKTOPS + 1. Fixes #1983 --- src/modules/xworkspaces.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/modules/xworkspaces.cpp b/src/modules/xworkspaces.cpp index 47c24b7a..33f605d6 100644 --- a/src/modules/xworkspaces.cpp +++ b/src/modules/xworkspaces.cpp @@ -5,13 +5,12 @@ #include "drawtypes/iconset.hpp" #include "drawtypes/label.hpp" +#include "modules/meta/base.inl" #include "utils/factory.hpp" #include "utils/math.hpp" #include "x11/atoms.hpp" #include "x11/connection.hpp" -#include "modules/meta/base.inl" - POLYBAR_NS namespace { @@ -240,8 +239,8 @@ namespace modules { names.erase(names.begin() + desktops_number, names.end()); return names; } - for (unsigned int i = names.size(); i < desktops_number + 1; i++) { - names.insert(names.end(), to_string(i)); + for (unsigned int i = names.size(); i < desktops_number; i++) { + names.insert(names.end(), to_string(i + 1)); } return names; }