2 files changed, 24 insertions, 1 deletions
diff --git a/Swift/QtUI/Roster/QtFilterWidget.cpp b/Swift/QtUI/Roster/QtFilterWidget.cpp
index a4c9449..64eb312 100644
--- a/Swift/QtUI/Roster/QtFilterWidget.cpp
+++ b/Swift/QtUI/Roster/QtFilterWidget.cpp
@@ -80,37 +80,40 @@ bool QtFilterWidget::eventFilter(QObject*, QEvent* event) {
 				updateRosterFilters();
 			} else if (keyEvent->key() == Qt::Key_Escape) {
 				filterLineEdit_->setText("");
 			} else {
 				isModifierSinglePressed_ = false;
 			}
 		}
 
 		filterLineEdit_->event(event);
-		filterLineEdit_->setVisible(!filterLineEdit_->text().isEmpty());
 
 		if (event->type() == QEvent::KeyRelease) {
 			updateRosterFilters();
 		}
 		return true;
 	}
 	return false;
 }
 
 void QtFilterWidget::popAllFilters() {
 	std::vector<RosterFilter*> filters = treeView_->getRoster()->getFilters();
 	foreach(RosterFilter* filter, filters) {
 		filters_.push_back(filter);
 		treeView_->getRoster()->removeFilter(filter);
 	}
+	treeView_->getRoster()->onFilterAdded.connect(boost::bind(&QtFilterWidget::handleFilterAdded, this, _1));
+	treeView_->getRoster()->onFilterRemoved.connect(boost::bind(&QtFilterWidget::handleFilterRemoved, this, _1));
 }
 
 void QtFilterWidget::pushAllFilters() {
+	treeView_->getRoster()->onFilterAdded.disconnect(boost::bind(&QtFilterWidget::handleFilterAdded, this, _1));
+	treeView_->getRoster()->onFilterRemoved.disconnect(boost::bind(&QtFilterWidget::handleFilterRemoved, this, _1));
 	foreach(RosterFilter* filter, filters_) {
 		treeView_->getRoster()->addFilter(filter);
 	}
 	filters_.clear();
 }
 
 void QtFilterWidget::updateRosterFilters() {
 	if (fuzzyRosterFilter_) {
 		if (filterLineEdit_->text().isEmpty()) {
@@ -124,23 +127,40 @@ void QtFilterWidget::updateRosterFilters() {
 			updateSearchFilter();
 		}
 	} else {
 		if (!filterLineEdit_->text().isEmpty()) {
 			// remove currently installed filters and put a search filter in place
 			popAllFilters();
 			updateSearchFilter();
 		}
 	}
+	filterLineEdit_->setVisible(!filterLineEdit_->text().isEmpty());
 }
 
 void QtFilterWidget::updateSearchFilter() {
 	if (fuzzyRosterFilter_) {
 		treeView_->getRoster()->removeFilter(fuzzyRosterFilter_);
 		delete fuzzyRosterFilter_;
 		fuzzyRosterFilter_ = NULL;
 	}
 	fuzzyRosterFilter_ = new FuzzyRosterFilter(Q2PSTRING(filterLineEdit_->text()));
 	treeView_->getRoster()->addFilter(fuzzyRosterFilter_);
 	treeView_->setCurrentIndex(sourceModel_->index(0, 0, sourceModel_->index(0,0)));
 }
 
+void QtFilterWidget::handleFilterAdded(RosterFilter* filter) {
+	if (filter != fuzzyRosterFilter_) {
+		filterLineEdit_->setText("");
+		updateRosterFilters();
+	}
+}
+
+void QtFilterWidget::handleFilterRemoved(RosterFilter* filter) {
+	/* make sure we don't end up adding this one back in later */
+	filters_.erase(std::remove(filters_.begin(), filters_.end(), filter), filters_.end());
+	if (filter != fuzzyRosterFilter_) {
+		filterLineEdit_->setText("");
+		updateRosterFilters();
+	}
+}
+
 }
diff --git a/Swift/QtUI/Roster/QtFilterWidget.h b/Swift/QtUI/Roster/QtFilterWidget.h
index 3e17566..d0307ea 100644
--- a/Swift/QtUI/Roster/QtFilterWidget.h
+++ b/Swift/QtUI/Roster/QtFilterWidget.h
@@ -29,18 +29,21 @@ class QtFilterWidget : public QWidget {
 		bool eventFilter(QObject*, QEvent* event);
 
 	private:
 		void popAllFilters();
 		void pushAllFilters();
 
 		void updateRosterFilters();
 		void updateSearchFilter();
 
+		void handleFilterAdded(RosterFilter* filter);
+		void handleFilterRemoved(RosterFilter* filter);
+
 	private:
 		QtClosableLineEdit* filterLineEdit_;
 		QtTreeWidget* treeView_;
 		UIEventStream* eventStream_;
 		std::vector<RosterFilter*> filters_;
 		QAbstractItemModel* sourceModel_;
 		FuzzyRosterFilter* fuzzyRosterFilter_;
 		bool isModifierSinglePressed_;
 };