1 files changed, 7 insertions, 1 deletions
diff --git a/Swift/QtUI/Roster/QtFilterWidget.cpp b/Swift/QtUI/Roster/QtFilterWidget.cpp
index a52dfff..2f561bd 100644
--- a/Swift/QtUI/Roster/QtFilterWidget.cpp
+++ b/Swift/QtUI/Roster/QtFilterWidget.cpp
@@ -22,61 +22,67 @@
 #include <Swift/Controllers/UIEvents/UIEventStream.h>
 
 #include <Swift/QtUI/QtClosableLineEdit.h>
 #include <Swift/QtUI/QtSwiftUtil.h>
 
 namespace Swift {
 
 QtFilterWidget::QtFilterWidget(QWidget* parent, QtTreeWidget* treeView, UIEventStream* eventStream, QBoxLayout* layout) : QWidget(parent), treeView_(treeView), eventStream_(eventStream), fuzzyRosterFilter_(nullptr), isModifierSinglePressed_(false) {
     int targetIndex = layout->indexOf(treeView);
 
     QVBoxLayout* vboxLayout = new QVBoxLayout(this);
     vboxLayout->setSpacing(0);
     vboxLayout->setContentsMargins(0,0,0,0);
 
     filterLineEdit_ = new QtClosableLineEdit(this);
     filterLineEdit_->hide();
     vboxLayout->addWidget(filterLineEdit_);
 
     vboxLayout->addWidget(treeView);
     setLayout(vboxLayout);
     layout->insertWidget(targetIndex, this);
 
     filterLineEdit_->installEventFilter(this);
     treeView_->installEventFilter(this);
 
     sourceModel_ = treeView_->model();
 }
 
 QtFilterWidget::~QtFilterWidget() {
     filterLineEdit_->removeEventFilter(this);
-    treeView_->removeEventFilter(this);
+    if (treeView_) {
+        treeView_->removeEventFilter(this);
+        if (treeView_->getRoster()) {
+            treeView_->getRoster()->onFilterAdded.disconnect(boost::bind(&QtFilterWidget::handleFilterAdded, this, _1));
+            treeView_->getRoster()->onFilterRemoved.disconnect(boost::bind(&QtFilterWidget::handleFilterRemoved, this, _1));
+        }
+    }
 }
 
 bool QtFilterWidget::eventFilter(QObject*, QEvent* event) {
     if (!treeView_) {
         return false;
     }
 
     if (event->type() == QEvent::KeyPress ||
         event->type() == QEvent::KeyRelease ||
         // InputMethodQuery got introduced in Qt 5.
 #if QT_VERSION >= 0x050000
         event->type() == QEvent::InputMethodQuery ||
 #endif
         event->type() == QEvent::InputMethod) {
         event->ignore();
         QKeyEvent* keyEvent = dynamic_cast<QKeyEvent*>(event);
         if (keyEvent) {
             if (keyEvent->key() == Qt::Key_Up || keyEvent->key() == Qt::Key_Down) {
                 return false;
             } else if ((keyEvent->key() == Qt::Key_Left || keyEvent->key() == Qt::Key_Right) && filterLineEdit_->text().isEmpty()) {
                 return false;
             } else if (keyEvent->key() == Qt::Key_Alt && event->type() == QEvent::KeyPress) {
                 isModifierSinglePressed_ = true;
             } else if ((keyEvent->key() == Qt::Key_Alt && event->type() == QEvent::KeyRelease && isModifierSinglePressed_)
                     || (keyEvent->key() == Qt::Key_Menu)) {
                 QPoint itemOffset(2,2);
                 QPoint contextMenuPosition = treeView_->visualRect(treeView_->currentIndex()).topLeft() + itemOffset;;
                 QApplication::postEvent(treeView_, new QContextMenuEvent(QContextMenuEvent::Keyboard, contextMenuPosition, treeView_->mapToGlobal(contextMenuPosition)));
                 return true;
             } else if (keyEvent->key() == Qt::Key_Return) {