liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Catch exceptions inside loop to continue listing files if there is an exception thrown for one or more files

Browse Source
This commit is contained in:
heckflosse
2018-06-21 19:19:25 +02:00
parent 2faa8ec4f1
commit 01d4ed3025
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
rtgui/filecatalog.cc
View File

@@ -564,21 +564,31 @@ std::vector<Glib::ustring> FileCatalog::getFileList ()
auto enumerator = dir->enumerate_children ("standard::name");
while (auto file = enumerator->next_file ()) {
while (true) {
try {
auto file = enumerator->next_file ();
if (!file) {
break;
}
const Glib::ustring fname = file->get_name ();
const Glib::ustring fname = file->get_name ();
auto lastdot = fname.find_last_of ('.');
if (lastdot >= fname.length () - 1) {
continue;
auto lastdot = fname.find_last_of ('.');
if (lastdot >= fname.length () - 1) {
continue;
}
const auto fext = fname.substr (lastdot + 1).lowercase ();
if (extensions.count (fext) == 0) {
continue;
}
names.emplace_back (Glib::build_filename (selectedDirectory, fname));
} catch (Glib::Exception& exception) {
if (options.rtSettings.verbose) {
std::cerr << exception.what () << std::endl;
}
}
const auto fext = fname.substr (lastdot + 1).lowercase ();
if (extensions.count (fext) == 0) {
continue;
}
names.emplace_back (Glib::build_filename (selectedDirectory, fname));
}
} catch (Glib::Exception& exception) {