From 3c312b9d760f47fab78b0b2871d04a1dfc5e8154 Mon Sep 17 00:00:00 2001 From: ed Date: Mon, 29 Apr 2019 11:24:22 +0100 Subject: [PATCH] Reworked the logic in FileBrowserComponent::currentFileIsValid() to ensure that directories can't be selected when only browsing for files --- .../filebrowser/juce_FileBrowserComponent.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.cpp b/modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.cpp index 35153cf1fe..94e3a40ef7 100644 --- a/modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.cpp +++ b/modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.cpp @@ -180,10 +180,10 @@ bool FileBrowserComponent::currentFileIsValid() const { auto f = getSelectedFile (0); - if (isSaveMode()) - return (flags & canSelectDirectories) != 0 || ! f.isDirectory(); + if ((flags & canSelectDirectories) == 0 && f.isDirectory()) + return false; - return f.exists(); + return isSaveMode() || f.exists(); } File FileBrowserComponent::getHighlightedFile() const noexcept