Imported Upstream version 2.4

1 files changed, 5 insertions, 1 deletions

diff --git a/src/backend/bookshelfmodel/btmodulenamefilterproxymodel.cpp b/src/backend/bookshelfmodel/btmodulenamefilterproxymodel.cpp
index 31b93e1..1d20cdb 100644
--- a/src/backend/bookshelfmodel/btmodulenamefilterproxymodel.cpp
+++ b/src/backend/bookshelfmodel/btmodulenamefilterproxymodel.cpp
@@ -12,8 +12,12 @@
 
 #include "backend/bookshelfmodel/btmodulenamefilterproxymodel.h"
 
+#include "backend/bookshelfmodel/btbookshelfmodel.h"
+
+
 BtModuleNameFilterProxyModel::BtModuleNameFilterProxyModel(QObject *parent)
         : QSortFilterProxyModel(parent), m_enabled(true) {
+    setFilterRole(BtBookshelfModel::ModuleNameRole);
     setFilterCaseSensitivity(Qt::CaseInsensitive);
 }
 
@@ -28,7 +32,7 @@ bool BtModuleNameFilterProxyModel::filterAcceptsRow(int row,
     const QAbstractItemModel *m(sourceModel());
     Q_ASSERT(m != 0);
 
-    QModelIndex itemIndex(m->index(row, 0, p));
+    QModelIndex itemIndex(m->index(row, filterKeyColumn(), p));
     int numChildren(m->rowCount(itemIndex));
     if (numChildren == 0) {
         return QSortFilterProxyModel::filterAcceptsRow(row, p);