When opening an empty folder, file browser shows image count from previous non-empty folder, Issue 606

rtgui/filebrowser.cc

@@ -1181,6 +1181,7 @@ void FileBrowser::applyFilter (const BrowserFilter& filter) {
 
     if (selchanged)
         notifySelectionListener ();
+    tbl->filterApplied();
     redraw ();
 }
 

rtgui/filebrowser.h

@@ -38,6 +38,7 @@ class FileBrowserListener {
 
     public:
         virtual     ~FileBrowserListener    () {}
+        virtual void filterApplied () {}
         virtual void openRequested          (std::vector<Thumbnail*> tbe) {}
         virtual void developRequested       (std::vector<FileBrowserEntry*> tbe, bool fastmode) {}
         virtual void renameRequested        (std::vector<FileBrowserEntry*> tbe) {}

rtgui/filecatalog.cc

@@ -564,7 +564,7 @@ void FileCatalog::_refreshProgressBar () {
             hbb = Gtk::manage (new Gtk::HBox ());
         if (!previewsToLoad ) {
             hbb->pack_start (*Gtk::manage (new Gtk::Image (Gtk::Stock::DIRECTORY, Gtk::ICON_SIZE_MENU)));
-            int filteredCount=fileBrowser->getNumFiltered();
+            int filteredCount = min(fileBrowser->getNumFiltered(),previewsLoaded);
 
             label = Gtk::manage (new Gtk::Label (M("MAIN_FRAME_FILEBROWSER")+
                 (filteredCount!=previewsLoaded ? " ["+ Glib::ustring::format(filteredCount)+"/" : " (") 
@@ -590,6 +590,11 @@ int refreshProgressBarUI (void* data) {
     return 0;
 }
 
+void FileCatalog::filterApplied() {
+    g_idle_add (refreshProgressBarUI, this);
+}
+
+
 void FileCatalog::previewReady (int dir_id, FileBrowserEntry* fdn) {
 
     if ( dir_id != selectedDirectoryId )

rtgui/filecatalog.h

@@ -259,6 +259,7 @@ class FileCatalog : public Gtk::VBox,
 
                 void showToolBar();
                 void hideToolBar();
+                void filterApplied();
 
 #ifndef _WIN32
                 void on_dir_changed (const Glib::RefPtr<Gio::File>& file, const Glib::RefPtr<Gio::File>& other_file, Gio::FileMonitorEvent event_type, bool internal);