diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2015-09-04 11:24:56 +1000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2015-09-04 11:50:08 +1000 |
| commit | ad6c71e1fdaa9839210d288225816edb7b0cfe74 (patch) | |
| tree | 11f3bd8f09ed67be2a59f369af2f1998984544f0 /libs/ardour/sndfilesource.cc | |
| parent | b3b5646a30e65db98a08b4bfe821d7aae3f2eec3 (diff) | |
Fix invalid error message when selecting directories/folders in Import dialog
On linux SndFileSource::get_soundfile_info was being called with an empty path
value when clicking on a folder in the left side part of the file browser which
resulted in an unnecessary error message.
On Windows every time a directory was selected in the Import dialog,
SndFileSource::get_soundfile_info would fail to open the directory in read only
mode and produce an error, but as we don't want to query/open soundfile info
for directories anyway just test and return if the path is a directory.
Diffstat (limited to 'libs/ardour/sndfilesource.cc')
| -rw-r--r-- | libs/ardour/sndfilesource.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc index 7dc2803a65..8df88a2732 100644 --- a/libs/ardour/sndfilesource.cc +++ b/libs/ardour/sndfilesource.cc @@ -937,6 +937,10 @@ SndFileSource::get_soundfile_info (const string& path, SoundFileInfo& info, stri sf_info.format = 0; // libsndfile says to clear this before sf_open(). + if (path.empty() || Glib::file_test(path, Glib::FILE_TEST_IS_DIR)) { + return false; + } + #ifdef PLATFORM_WINDOWS int fd = g_open (path.c_str(), O_RDONLY, 0444); #else |