4 files changed, 19 insertions, 4 deletions

diff --git a/src/ClientPattern.hh b/src/ClientPattern.hh
index 611adeb..4e25cb5 100644
--- a/src/ClientPattern.hh
+++ b/src/ClientPattern.hh
@@ -74,6 +74,8 @@ public:
     bool addTerm(const std::string &str, WinProperty prop, bool negate = false);
 
     void addMatch() { ++m_nummatches; }
+    void removeMatch() { --m_nummatches; }
+    void resetMatches() { m_nummatches = 0; }
 
     // whether this pattern has identical matching criteria
     bool operator ==(const ClientPattern &pat) const;
diff --git a/src/FocusableList.cc b/src/FocusableList.cc
index d15e10a..98492b8 100644
--- a/src/FocusableList.cc
+++ b/src/FocusableList.cc
@@ -156,10 +156,12 @@ void FocusableList::checkUpdate(Focusable &win) {
     if (contains(win)) {
         if (!m_pat->match(win)) {
             m_list.remove(&win);
+            m_pat->removeMatch();
             m_removesig.notify(&win);
         }
     } else if (m_pat->match(win)) {
         insertFromParent(win);
+        m_pat->addMatch();
         m_addsig.notify(&win);
     }
 }
@@ -194,9 +196,10 @@ void FocusableList::addMatching() {
     const Focusables list = m_parent->clientList();
     Focusables::const_iterator it = list.begin(), it_end = list.end();
     for (; it != it_end; ++it) {
-        if (m_pat->match(**it))
+        if (m_pat->match(**it)) {
             pushBack(**it);
-        else // we still want to watch it, in case it changes to match
+            m_pat->addMatch();
+        } else // we still want to watch it, in case it changes to match
             attachSignals(**it);
     }
 }
@@ -279,6 +282,7 @@ void FocusableList::reset() {
         detachSignals(*m_list.back());
         m_list.pop_back();
     }
+    m_pat->resetMatches();
     if (m_parent)
         addMatching();
     m_resetsig.notify(0);
diff --git a/src/Remember.cc b/src/Remember.cc
index 43437f4..a1f5d62 100644
--- a/src/Remember.cc
+++ b/src/Remember.cc
@@ -1373,6 +1373,16 @@ void Remember::updateClientClose(WinClient &winclient) {
     checkReload(); // reload if it's changed
     Application *app = find(winclient);
 
+    if (app) {
+        Patterns::iterator it = m_pats->begin();
+        for (; it != m_pats->end(); it++) {
+            if (it->second == app) {
+                it->first->removeMatch();
+                break;
+            }
+        }
+    }
+
     if (app && (app->save_on_close_remember && app->save_on_close)) {
 
         for (int attrib = 0; attrib < REM_LASTATTRIB; attrib++) {
diff --git a/src/WorkspaceCmd.cc b/src/WorkspaceCmd.cc
index 592b34b..41c7832 100644
--- a/src/WorkspaceCmd.cc
+++ b/src/WorkspaceCmd.cc
@@ -69,8 +69,7 @@ FbTk::Command<void> *WindowListCmd::parse(const string &command, const string &a
     if (tokens.size() > 1) {
         FocusableList::parseArgs(tokens[1], opts, pat);
 
-        filter = FbTk::CommandParser<bool>::instance().parse(pat,
-                                                                     trusted);
+        filter = FbTk::CommandParser<bool>::instance().parse(pat, trusted);
     }
 
     return new WindowListCmd(FbTk::RefCount<FbTk::Command<void> >(cmd), opts,