1 files changed, 11 insertions, 4 deletions

diff --git a/src/FocusableList.cc b/src/FocusableList.cc
index b06faac..b2b0320 100644
--- a/src/FocusableList.cc
+++ b/src/FocusableList.cc
@@ -100,8 +100,10 @@ void FocusableList::init() {
         join(m_screen.currentWorkspaceSig(),
              FbTk::MemFun(*this, &FocusableList::workspaceChanged));
     }
-    if (m_pat->dependsOnFocusedWindow())
-        m_screen.focusedWindowSig().attach(this);
+    if (m_pat->dependsOnFocusedWindow()) {
+        join(m_screen.focusedWindowSig(),
+             FbTk::MemFun(*this, &FocusableList::focusedWindowChanged));
+    }
 }
 
 void FocusableList::update(FbTk::Subject *subj) {
@@ -150,8 +152,7 @@ void FocusableList::update(FbTk::Subject *subj) {
             if (insertFromParent(*win))
                 m_ordersig.notify(win);
         }
-    } else if (subj == &m_screen.focusedWindowSig())
-        reset();
+    }
 }
 
 void FocusableList::checkUpdate(Focusable &win) {
@@ -315,3 +316,9 @@ void FocusableList::attachChild(FocusableList &child) const {
 void FocusableList::workspaceChanged(BScreen &screen) {
     reset();
 }
+
+void FocusableList::focusedWindowChanged(BScreen &screen,
+                                         FluxboxWindow *focused_win,
+                                         WinClient *client) {
+    reset();
+}