From 68ad0ef3d8133952a8aa7e95dbc43328655a8bbc Mon Sep 17 00:00:00 2001 From: Tom Poole Date: Thu, 21 Apr 2022 12:05:41 +0100 Subject: [PATCH] DirectoryContentsList: Fix a bug in isStillLoading --- .../juce_gui_basics/filebrowser/juce_DirectoryContentsList.cpp | 3 ++- .../juce_gui_basics/filebrowser/juce_DirectoryContentsList.h | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.cpp b/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.cpp index 1dd9919d30..8756f9e969 100644 --- a/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.cpp +++ b/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.cpp @@ -103,7 +103,7 @@ void DirectoryContentsList::refresh() if (root.isDirectory()) { - fileFindHandle = std::make_unique(root, false, "*", fileTypeFlags); + fileFindHandle = std::make_unique (root, false, "*", fileTypeFlags); shouldStop = false; isSearching = true; thread.addTimeSliceClient (this); @@ -215,6 +215,7 @@ bool DirectoryContentsList::checkNextFile (bool& hasChanged) } fileFindHandle = nullptr; + isSearching = false; if (! wasEmpty && files.isEmpty()) hasChanged = true; diff --git a/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.h b/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.h index 0d3d01646b..eb19ad7328 100644 --- a/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.h +++ b/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.h @@ -201,8 +201,7 @@ private: OwnedArray files; std::unique_ptr fileFindHandle; - std::atomic shouldStop { true }; - bool isSearching = false; + std::atomic shouldStop { true }, isSearching { false }; bool wasEmpty = true;