Make sure we reload the filter criteria if the set of keywords changes.

Fixes #2504.
This commit is contained in:
Theron Tock
2011-06-16 15:59:14 -07:00
parent ec794ef430
commit 6dedc26452
2 changed files with 4 additions and 1 deletions
+3 -1
View File
@@ -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();
}
+1
View File
@@ -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();