From 6dedc26452129ae9453f5c908c82db78a253367c Mon Sep 17 00:00:00 2001
From: Theron Tock <theron@netcitadel.com>
Date: Thu, 16 Jun 2011 15:59:14 -0700
Subject: [PATCH] Make sure we reload the filter criteria if the set of
 keywords changes. Fixes #2504.

---
 src/libgui/DynamicGroupDialog.cpp | 4 +++-
 src/libgui/DynamicGroupDialog.h   | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/libgui/DynamicGroupDialog.cpp b/src/libgui/DynamicGroupDialog.cpp
index 1676fb43a..ea89a66ba 100644
--- a/src/libgui/DynamicGroupDialog.cpp
+++ b/src/libgui/DynamicGroupDialog.cpp
@@ -247,6 +247,7 @@ void DynamicGroupDialog::loadObjFilter()
 
     m_reloadObjFilter = false;
     m_loadedObjFilter = filter;
+    m_loadedAllKeywords = obj->getAllKeywords();
 }
 
 
@@ -255,7 +256,8 @@ void DynamicGroupDialog::loadFWObject(FWObject *o)
     DynamicGroup *objGroup = dynamic_cast<DynamicGroup *>(o);
 
     const list<string> &filter = objGroup->getFilter();
-    if (obj != o || m_reloadObjFilter || m_loadedObjFilter != filter) {
+    if (obj != o || m_reloadObjFilter || m_loadedObjFilter != filter ||
+        m_loadedAllKeywords != o->getAllKeywords()) {
         obj = o;
         loadObjFilter();
     }
diff --git a/src/libgui/DynamicGroupDialog.h b/src/libgui/DynamicGroupDialog.h
index 3b33276b3..631b56eab 100644
--- a/src/libgui/DynamicGroupDialog.h
+++ b/src/libgui/DynamicGroupDialog.h
@@ -50,6 +50,7 @@ class DynamicGroupDialog : public BaseObjectDialog
     QStandardItemModel *m_model;
     bool m_reloadObjFilter;
     std::list<std::string> m_loadedObjFilter;
+    std::set<std::string> m_loadedAllKeywords;
 
     void loadObjFilter();