Merge

1 files changed, 13 insertions, 9 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 89dc9904..bbc336a7 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -2383,8 +2383,15 @@ void MainWindow::refreshFilters()
   ui->modList->setCurrentIndex(QModelIndex());
 
   // save previous filter text so we can restore it later, in case the filter still exists then
-  QTreeWidgetItem *currentItem = ui->categoriesList->currentItem();
-  QString previousFilter = currentItem != NULL ? currentItem->text(0) : tr("<All>");
+//  QTreeWidgetItem *currentItem = ui->categoriesList->currentItem();
+//  QString previousFilter = currentItem != NULL ? currentItem->text(0) : tr("<All>");
+
+
+  QStringList selectedItems;
+  foreach (QTreeWidgetItem *item, ui->categoriesList->selectedItems()) {
+    selectedItems.append(item->text(0));
+  }
+
 
   ui->categoriesList->clear();
   addFilterItem(NULL, tr("<Checked>"), CategoryFactory::CATEGORY_SPECIAL_CHECKED);
@@ -2408,13 +2415,10 @@ void MainWindow::refreshFilters()
 
   addCategoryFilters(NULL, categoriesUsed, 0);
 
-  QList<QTreeWidgetItem*> matches = ui->categoriesList->findItems(previousFilter, Qt::MatchFixedString | Qt::MatchRecursive);
-  if (matches.size() > 0) {
-    QTreeWidgetItem *currentItem = matches.at(0);
-    ui->categoriesList->setCurrentItem(currentItem);
-    while (currentItem != NULL) {
-      currentItem->setExpanded(true);
-      currentItem = currentItem->parent();
+  foreach (const QString &item, selectedItems) {
+    QList<QTreeWidgetItem*> matches = ui->categoriesList->findItems(item, Qt::MatchFixedString | Qt::MatchRecursive);
+    if (matches.size() > 0) {
+      matches.at(0)->setSelected(true);
     }
   }