From f581095cb7effe3db09631aa82c2bd081c623889 Mon Sep 17 00:00:00 2001
From: rps <rps@jupiter.lan>
Date: Tue, 16 May 2017 22:34:03 -0500
Subject: [PATCH] Fixes #535 and #411.

---
 src/modules/xworkspaces.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/modules/xworkspaces.cpp b/src/modules/xworkspaces.cpp
index 7401eb5b..642bec05 100644
--- a/src/modules/xworkspaces.cpp
+++ b/src/modules/xworkspaces.cpp
@@ -204,13 +204,11 @@ namespace modules {
   void xworkspaces_module::rebuild_desktop_states() {
     for (auto&& v : m_viewports) {
       for (auto&& d : v->desktops) {
-        if (d->index == m_current_desktop && d->state != desktop_state::ACTIVE) {
+        if (d->index == m_current_desktop) {
           d->state = desktop_state::ACTIVE;
-        } else if (d->state == desktop_state::ACTIVE) {
+        } else {
           d->state = desktop_state::EMPTY;
-        } else if (d->label) {
-          continue;
-        }
+        } 
 
         d->label = m_labels.at(d->state)->clone();
         d->label->reset_tokens();