From 387a7d034542fcc9c7fb8038dbc2b7318bbb334e Mon Sep 17 00:00:00 2001
From: Zlatin Balevsky <zlatinb@gmail.com>
Date: Sat, 16 Oct 2021 15:08:58 +0100
Subject: [PATCH] Change behavior of library filter as well.  GitHub issue #88

---
 .../models/com/muwire/gui/MainFrameModel.groovy           | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gui/griffon-app/models/com/muwire/gui/MainFrameModel.groovy b/gui/griffon-app/models/com/muwire/gui/MainFrameModel.groovy
index 33123a69..ca2f3e7e 100644
--- a/gui/griffon-app/models/com/muwire/gui/MainFrameModel.groovy
+++ b/gui/griffon-app/models/com/muwire/gui/MainFrameModel.groovy
@@ -495,13 +495,15 @@ class MainFrameModel {
     }
     
     void filterLibrary() {
+        filterer?.cancel()
         view.clearSelectedFiles()
         shared.clear()
         treeRoot.removeAllChildren()
-        filterer?.cancel()
+        view.refreshSharedFiles()
         if (filter != null) {
             filterer = new Filterer()
             filterer.execute()
+            setFilteringEnabled(false)
         } else {
             synchronized (allSharedFiles) {
                 shared.addAll(allSharedFiles)
@@ -537,18 +539,20 @@ class MainFrameModel {
 
         @Override
         protected void process(List<SharedFile> chunks) {
-            if (cancelled)
+            if (cancelled || chunks.isEmpty())
                 return
             shared.addAll(chunks)
             chunks.each {
                 insertIntoTree(it, treeRoot, null)
             }
+            view.refreshSharedFiles()
         }
 
         @Override
         protected void done() {
             if (cancelled)
                 return
+            setFilteringEnabled(true)
             view.refreshSharedFiles()
             if (filter != null)
                 view.fullTreeExpansion()